Refactor net.Error.Temporary

Signed-off-by: noor <[email protected]>

Author: demonCoder95

loadbalancer/healthchecker.go

@@ -215,8 +215,7 @@ func doActiveHealthCheck(rt http.RoundTripper, backend string) state {
 	resp, err := rt.RoundTrip(req)
 	if err != nil {
 		perr, ok := err.(net.Error)
-		//lint:ignore SA1019 Temporary is deprecated in Go 1.18, but keep it for now (https://github.com/zalando/skipper/issues/1992)
-		if ok && !perr.Temporary() {
+		if ok && !perr.Timeout() {
 			log.Infof("Backend %v connection refused -> mark as dead", backend)
 			return dead
 		} else if ok {

proxy/proxy.go

@@ -966,8 +966,7 @@ func (p *Proxy) makeBackendRequest(ctx *context, requestContext stdlibcontext.Co
 				status = http.StatusServiceUnavailable
 			}
 			p.tracing.setTag(ctx.proxySpan, HTTPStatusCodeTag, uint16(status))
-			//lint:ignore SA1019 Temporary is deprecated in Go 1.18, but keep it for now (https://github.com/zalando/skipper/issues/1992)
-			return nil, &proxyError{err: fmt.Errorf("net.Error during backend roundtrip to %s: timeout=%v temporary='%v': %w", req.URL.Host, nerr.Timeout(), nerr.Temporary(), err), code: status}
+			return nil, &proxyError{err: fmt.Errorf("net.Error during backend roundtrip to %s: timeout=%v : %w", req.URL.Host, nerr.Timeout(), err), code: status}
 		}
 
 		return nil, &proxyError{err: fmt.Errorf("unexpected error from Go stdlib net/http package during roundtrip: %w", err)}

queuelistener/listener.go

@@ -230,8 +230,7 @@ func (l *listener) listenExternal() {
 		c, err = l.externalListener.Accept()
 		if err != nil {
 			// based on net/http.Server.Serve():
-			//lint:ignore SA1019 Temporary is deprecated in Go 1.18, but keep it for now (https://github.com/zalando/skipper/issues/1992)
-			if nerr, ok := err.(net.Error); ok && nerr.Temporary() {
+			if nerr, ok := err.(net.Error); ok && nerr.Timeout() {
 				delay = bounce(delay)
 				l.options.Log.Errorf(
 					"queue listener: accept error: %v, retrying in %v",

queuelistener/listener_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/zalando/skipper/logging/loggingtest"
 	"github.com/zalando/skipper/metrics/metricstest"
 )
 
@@ -21,22 +20,13 @@ type testConnection struct {
 
 type testListener struct {
 	sync.Mutex
-	closed            bool
-	failNextTemporary bool
-	fail              bool
-	connsBeforeFail   int
-	addr              net.Addr
-	conns             chan *testConnection
+	closed          bool
+	fail            bool
+	connsBeforeFail int
+	addr            net.Addr
+	conns           chan *testConnection
 }
 
-type testError struct{}
-
-var errTemporary testError
-
-func (err testError) Error() string   { return "test error" }
-func (err testError) Timeout() bool   { return false }
-func (err testError) Temporary() bool { return true }
-
 func (c *testConnection) Read([]byte) (int, error)         { return 0, nil }
 func (c *testConnection) Write([]byte) (int, error)        { return 0, nil }
 func (c *testConnection) LocalAddr() net.Addr              { return nil }
@@ -59,10 +49,6 @@ func (c *testConnection) isClosed() bool {
 }
 
 func (l *testListener) Accept() (net.Conn, error) {
-	if l.failNextTemporary {
-		l.failNextTemporary = false
-		return nil, errTemporary
-	}
 
 	if l.fail {
 		return nil, errors.New("listener error")
@@ -353,28 +339,6 @@ func TestInterface(t *testing.T) {
 		}
 	})
 
-	t.Run("wrapped listener returns temporary error, logs and retries", func(t *testing.T) {
-		log := loggingtest.New()
-		l, err := listenWith(&testListener{failNextTemporary: true}, Options{
-			Log: log,
-		})
-
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		defer l.Close()
-		conn, err := l.Accept()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		defer conn.Close()
-		if err := log.WaitFor(errTemporary.Error(), 120*time.Millisecond); err != nil {
-			t.Error("failed to log temporary error")
-		}
-	})
-
 	t.Run("wrapped permanently fails, returns queued connections and the error", func(t *testing.T) {
 		m := &metricstest.MockMetrics{}
 		l, err := listenWith(&testListener{connsBeforeFail: 3}, Options{
@@ -982,27 +946,6 @@ func TestTeardown(t *testing.T) {
 }
 
 func TestMonitoring(t *testing.T) {
-	t.Run("logs the temporary errors", func(t *testing.T) {
-		log := loggingtest.New()
-		l, err := listenWith(&testListener{failNextTemporary: true}, Options{
-			Log: log,
-		})
-
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		defer l.Close()
-		conn, err := l.Accept()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		defer conn.Close()
-		if err := log.WaitFor(errTemporary.Error(), 120*time.Millisecond); err != nil {
-			t.Error("failed to log temporary error")
-		}
-	})
 
 	t.Run("updates the gauges for the concurrency and the queue size, measures accept latency", func(t *testing.T) {
 		m := &metricstest.MockMetrics{}