fix: barry quick fix, 2025-09-06 01:52:47

Author: kooksee

errors/aaa.go

@@ -4,8 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
+	"github.com/pubgo/funk/errors/errinter"
 )
 
 var (
@@ -64,9 +63,7 @@ func (t Tag) String() string {
 	return fmt.Sprintf("%s: %v", t.K, t.V)
 }
 
-type ErrUnwrap interface {
-	Unwrap() error
-}
+type ErrUnwrap errinter.ErrUnwrap
 
 type ErrIs interface {
 	Is(error) bool
@@ -76,18 +73,6 @@ type ErrAs interface {
 	As(any) bool
 }
 
-type Error interface {
-	ID() string
-	Kind() string
-	Error() string
-	String() string
-	MarshalJSON() ([]byte, error)
-}
-
-type ErrorProto interface {
-	Proto() proto.Message
-}
-
-type GRPCStatus interface {
-	GRPCStatus() *status.Status
-}
+type Error = errinter.Error
+type ErrorProto = errinter.ErrorProto
+type GRPCStatus = errinter.GRPCStatus

errors/errinter/aaa.go

@@ -0,0 +1,26 @@
+package errinter
+
+import (
+	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
+)
+
+type Error interface {
+	ID() string
+	Kind() string
+	Error() string
+	String() string
+	MarshalJSON() ([]byte, error)
+}
+
+type ErrUnwrap interface {
+	Unwrap() error
+}
+
+type ErrorProto interface {
+	Proto() proto.Message
+}
+
+type GRPCStatus interface {
+	GRPCStatus() *status.Status
+}

errors/errinter/utils.go

@@ -2,11 +2,15 @@ package errinter
 
 import (
 	"errors"
+	"fmt"
 	"strings"
 	"sync"
 
 	"github.com/k0kubun/pp/v3"
+	"google.golang.org/protobuf/proto"
+	
 	"github.com/pubgo/funk"
+	"github.com/pubgo/funk/proto/errorpb"
 )
 
 func ParseError(val interface{}) error {
@@ -40,3 +44,42 @@ var Simple = sync.OnceValue(func() *pp.PrettyPrinter {
 func SimplePrint(v interface{}) string {
 	return strings.ReplaceAll(Simple().Sprint(v), "\n", "")
 }
+
+func GetErrorId(err error) string {
+	if err == nil {
+		return ""
+	}
+
+	for err != nil {
+		if v, ok := err.(Error); ok {
+			return v.ID()
+		}
+
+		err = Unwrap(err)
+	}
+
+	return ""
+}
+
+func Unwrap(err error) error {
+	u, ok := err.(ErrUnwrap)
+	if !ok {
+		return nil
+	}
+	return u.Unwrap()
+}
+
+func ParseErrToPb(err error) proto.Message {
+	switch err1 := err.(type) {
+	case nil:
+		return nil
+	case ErrorProto:
+		return err1.Proto()
+	case GRPCStatus:
+		return err1.GRPCStatus().Proto()
+	case proto.Message:
+		return err1
+	default:
+		return &errorpb.ErrMsg{Msg: err.Error(), Detail: fmt.Sprintf("%v", err)}
+	}
+}

log/global.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/pubgo/funk/assert"
-	"github.com/pubgo/funk/errors"
+	"github.com/pubgo/funk/errors/errinter"
 	"github.com/pubgo/funk/generic"
 
 	"github.com/rs/zerolog"
@@ -38,7 +38,7 @@ var (
 			}
 
 			errDetail := errDetail(err)
-			id := errors.GetErrorId(err)
+			id := errinter.GetErrorId(err)
 			if id != "" {
 				return fmt.Sprintf("%s, error_id:%s error_detail:%s", err.Error(), id, errDetail)
 			}
@@ -56,7 +56,7 @@ var (
 			Output(zerolog.NewConsoleWriter(func(w *zerolog.ConsoleWriter) {
 				w.Out = os.Stderr
 				w.TimeFormat = time.RFC3339
-			})).Hook(new(hookImpl), logGlobalHook),
+			})).Hook(logGlobalHook),
 	)
 
 	_ = generic.Init(func() {

log/impl.log.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/rs/zerolog"
 
-	"github.com/pubgo/funk/errors"
+	"github.com/pubgo/funk/errors/errinter"
 	"github.com/pubgo/funk/log/logfields"
 )
 
@@ -146,7 +146,7 @@ func (l *loggerImpl) Err(err error, ctxL ...context.Context) *zerolog.Event {
 			return
 		}
 
-		if id := errors.GetErrorId(err); id != "" {
+		if id := errinter.GetErrorId(err); id != "" {
 			e.Str("error_id", id)
 		}
 

log/hooks.go log/loghooks/hooks.golog/hooks.go renamed to log/loghooks/hooks.go

@@ -1,4 +1,4 @@
-package log
+package loghooks
 
 import (
 	"sync/atomic"

log/util.go

@@ -3,7 +3,7 @@ package log
 import (
 	"context"
 
-	"github.com/pubgo/funk/errors"
+	"github.com/pubgo/funk/errors/errinter"
 	"github.com/samber/lo"
 	"google.golang.org/protobuf/encoding/prototext"
 )
@@ -13,7 +13,7 @@ func errDetail(err error) string {
 		return ""
 	}
 
-	return prototext.Format(errors.ParseErrToPb(err))
+	return prototext.Format(errinter.ParseErrToPb(err))
 }
 
 func RecordErr(logs ...Logger) func(ctx context.Context, err error) error {

log/z_log_test.go

@@ -21,7 +21,6 @@ func TestWithName(t *testing.T) {
 		Func(func(e *zerolog.Event) {
 			var buf = gjson.ParseBytes(log.GetEventBuf(e))
 			assert.Equal(t, buf.Get("logger").String(), "log1")
-			assert.Equal(t, buf.Get("module").String(), "github.com/pubgo/funk/log_test")
 		}).Msg("hello")
 
 	log.GetLogger("log1").
@@ -30,14 +29,12 @@ func TestWithName(t *testing.T) {
 		Func(func(e *zerolog.Event) {
 			var buf = gjson.ParseBytes(log.GetEventBuf(e))
 			assert.Equal(t, buf.Get("logger").String(), "log1.log2")
-			assert.Equal(t, buf.Get("module").String(), "github.com/pubgo/funk/log_test")
 		}).Msg("hello")
 
 	log.Debug().
 		Func(func(e *zerolog.Event) {
 			var buf = gjson.ParseBytes(log.GetEventBuf(e))
 			assert.Equal(t, buf.Get("logger").String(), "")
-			assert.Equal(t, buf.Get("module").String(), "")
 		}).Msg("hello")
 }