optimize: uniform error creation

internal/bytesconv/errors.go

@@ -41,13 +41,13 @@
 
 package bytesconv
 
-import "errors"
+import "github.com/cloudwego/hertz/pkg/common/errors"
 
 var (
-	errEmptyInt               = errors.New("empty integer")
-	errUnexpectedFirstChar    = errors.New("unexpected first char found. Expecting 0-9")
-	errUnexpectedTrailingChar = errors.New("unexpected trailing char found. Expecting 0-9")
-	errTooLongInt             = errors.New("too long int")
-	errEmptyHexNum            = errors.New("empty hex number")
-	errTooLargeHexNum         = errors.New("too large hex number")
+	errEmptyInt               = errors.NewPublic("empty integer")
+	errUnexpectedFirstChar    = errors.NewPublic("unexpected first char found. Expecting 0-9")
+	errUnexpectedTrailingChar = errors.NewPublic("unexpected trailing char found. Expecting 0-9")
+	errTooLongInt             = errors.NewPublic("too long int")
+	errEmptyHexNum            = errors.NewPublic("empty hex number")
+	errTooLargeHexNum         = errors.NewPublic("too large hex number")
 )

pkg/app/server/hertz.go

@@ -18,14 +18,14 @@ package server
 
 import (
 	"context"
-	"errors"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
 	"github.com/cloudwego/hertz/pkg/app/middlewares/server/recovery"
 	"github.com/cloudwego/hertz/pkg/common/config"
+	"github.com/cloudwego/hertz/pkg/common/errors"
 	"github.com/cloudwego/hertz/pkg/common/hlog"
 	"github.com/cloudwego/hertz/pkg/route"
 )
@@ -108,7 +108,7 @@ func waitSignal(errCh chan error) error {
 		switch sig {
 		case syscall.SIGTERM:
 			// force exit
-			return errors.New(sig.String()) // nolint
+			return errors.NewPublic(sig.String()) // nolint
 		case syscall.SIGHUP, syscall.SIGINT:
 			hlog.SystemLogger().Infof("Received signal: %s\n", sig)
 			// graceful shutdown

pkg/common/stackless/writer.go

@@ -42,11 +42,11 @@
 package stackless
 
 import (
-	"errors"
 	"fmt"
 	"io"
 
 	"github.com/cloudwego/hertz/pkg/common/bytebufferpool"
+	"github.com/cloudwego/hertz/pkg/common/errors"
 )
 
 // Writer is an interface stackless writer must conform to.
@@ -137,7 +137,7 @@ func (w *writer) do(op op) error {
 	return err
 }
 
-var errHighLoad = errors.New("cannot compress data due to high load")
+var errHighLoad = errors.NewPublic("cannot compress data due to high load")
 
 var stacklessWriterFunc = NewFunc(writerFunc)
 

pkg/common/test/mock/network.go

@@ -18,12 +18,11 @@ package mock
 
 import (
 	"bytes"
-	"errors"
 	"net"
 	"strings"
 	"time"
 
-	errs "github.com/cloudwego/hertz/pkg/common/errors"
+	"github.com/cloudwego/hertz/pkg/common/errors"
 	"github.com/cloudwego/hertz/pkg/network"
 	"github.com/cloudwego/netpoll"
 )
@@ -86,7 +85,7 @@ func (m *Conn) Peek(i int) ([]byte, error) {
 			select {}
 		}
 		time.Sleep(m.readTimeout)
-		return nil, errs.ErrTimeout
+		return nil, errors.ErrTimeout
 	}
 	return b, err
 }
@@ -136,7 +135,7 @@ func (m *SlowReadConn) Peek(i int) ([]byte, error) {
 	time.Sleep(100 * time.Millisecond)
 	if err != nil || len(b) != i {
 		time.Sleep(m.readTimeout)
-		return nil, errs.ErrReadTimeout
+		return nil, errors.ErrReadTimeout
 	}
 	return b, err
 }
@@ -174,7 +173,7 @@ func (m *SlowWriteConn) Flush() error {
 	time.Sleep(100 * time.Millisecond)
 	if err == nil {
 		time.Sleep(m.writeTimeout)
-		return errs.ErrWriteTimeout
+		return errors.ErrWriteTimeout
 	}
 	return err
 }
@@ -251,15 +250,15 @@ func (m *StreamConn) Peek(n int) ([]byte, error) {
 		m.Data = m.Data[:cap(m.Data)]
 		return m.Data[:1], nil
 	}
-	return nil, errors.New("not enough data")
+	return nil, errors.NewPublic("not enough data")
 }
 
 func (m *StreamConn) Skip(n int) error {
 	if len(m.Data) >= n {
 		m.Data = m.Data[n:]
 		return nil
 	}
-	return errors.New("not enough data")
+	return errors.NewPublic("not enough data")
 }
 
 func (m *StreamConn) Release() error {

pkg/common/tracer/stats/event.go

@@ -17,9 +17,10 @@
 package stats
 
 import (
-	"errors"
 	"sync"
 	"sync/atomic"
+
+	"github.com/cloudwego/hertz/pkg/common/errors"
 )
 
 // EventIndex indicates a unique event.
@@ -88,8 +89,8 @@ var (
 
 // errors
 var (
-	ErrNotAllowed = errors.New("event definition is not allowed after initialization")
-	ErrDuplicated = errors.New("event name is already defined")
+	errNotAllowed = errors.NewPublic("event definition is not allowed after initialization")
+	errDuplicated = errors.NewPublic("event name is already defined")
 )
 
 var (
@@ -107,13 +108,13 @@ func FinishInitialization() {
 // DefineNewEvent allows user to add event definitions during program initialization.
 func DefineNewEvent(name string, level Level) (Event, error) {
 	if atomic.LoadInt32(&inited) == 1 {
-		return nil, ErrNotAllowed
+		return nil, errNotAllowed
 	}
 	lock.Lock()
 	defer lock.Unlock()
 	evt, exist := userDefined[name]
 	if exist {
-		return evt, ErrDuplicated
+		return evt, errDuplicated
 	}
 	userDefined[name] = newEvent(EventIndex(maxEventNum), level)
 	maxEventNum++

pkg/common/tracer/stats/event_test.go

@@ -35,7 +35,7 @@ func TestDefineNewEvent(t *testing.T) {
 
 	event2, err2 := DefineNewEvent("myevent", LevelBase)
 	num2 := MaxEventNum()
-	assert.Assert(t, err2 == ErrDuplicated)
+	assert.Assert(t, err2 == errDuplicated)
 	assert.Assert(t, event2 == event1)
 	assert.Assert(t, num2 == num1)
 	assert.Assert(t, event2.Level() == LevelDetailed)
@@ -44,7 +44,7 @@ func TestDefineNewEvent(t *testing.T) {
 
 	event3, err3 := DefineNewEvent("another", LevelDetailed)
 	num3 := MaxEventNum()
-	assert.Assert(t, err3 == ErrNotAllowed)
+	assert.Assert(t, err3 == errNotAllowed)
 	assert.Assert(t, event3 == nil)
 	assert.Assert(t, num3 == num1)
 }

pkg/protocol/http1/proxy/proxy.go

@@ -28,11 +28,11 @@ import (
 	"context"
 	"crypto/tls"
 	"encoding/base64"
-	"errors"
 	"time"
 
 	"github.com/cloudwego/hertz/internal/bytesconv"
 	"github.com/cloudwego/hertz/internal/bytestr"
+	"github.com/cloudwego/hertz/pkg/common/errors"
 	"github.com/cloudwego/hertz/pkg/network"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/protocol/consts"
@@ -111,7 +111,7 @@ func SetupProxy(conn network.Conn, addr string, proxyURI *protocol.URI, tlsConfi
 		if connectResp.StatusCode() != consts.StatusOK {
 			conn.Close()
 
-			return nil, errors.New(consts.StatusMessage(connectResp.StatusCode()))
+			return nil, errors.NewPublic(consts.StatusMessage(connectResp.StatusCode()))
 		}
 	}