fix: barry quick fix, 2025-09-06 19:03:03

Author: kooksee

v2/result/error.go

@@ -5,11 +5,9 @@ import (
 	"fmt"
 
 	"github.com/rs/zerolog"
-	"google.golang.org/protobuf/encoding/prototext"
 
 	"github.com/pubgo/funk/errors"
 	"github.com/pubgo/funk/errors/errutil"
-	"github.com/pubgo/funk/log"
 )
 
 var _ Catchable = new(Error)
@@ -37,32 +35,12 @@ func (e Error) Map(fn func(error) error) Error {
 }
 
 func (e Error) LogCtx(ctx context.Context, events ...func(e *zerolog.Event)) Error {
-	if e.IsErr() {
-		err := e.err
-		log.Error(ctx).
-			Func(func(e *zerolog.Event) {
-				for _, fn := range events {
-					fn(e)
-				}
-			}).
-			Str(zerolog.ErrorFieldName, err.Error()).
-			CallerSkipFrame(1).
-			Str("error_id", errors.GetErrorId(err)).
-			Msgf("%s\n%s", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
-	}
-
+	logErr(ctx, e.err, events...)
 	return e
 }
 
-func (e Error) Log(contexts ...context.Context) Error {
-	if e.IsErr() {
-		log.Error(contexts...).
-			Str(zerolog.ErrorFieldName, e.err.Error()).
-			CallerSkipFrame(1).
-			Str("error_id", errors.GetErrorId(e.err)).
-			Msgf("%s\n%s", e.err.Error(), prototext.Format(errors.ParseErrToPb(e.err)))
-	}
-
+func (e Error) Log(events ...func(e *zerolog.Event)) Error {
+	logErr(nil, e.err, events...)
 	return e
 }
 

v2/result/error_test.go

@@ -1,16 +1,15 @@
 package result
 
 import (
-	"github.com/rs/zerolog"
 	"testing"
 
 	"github.com/pubgo/funk/errors"
+	"github.com/rs/zerolog"
 )
 
 func TestErrorLog(t *testing.T) {
 	ErrOf(errors.New("test")).
-		Log().
-		LogCtx(nil, func(e *zerolog.Event) {
-			e.Str("abc", "test")
+		Log(func(e *zerolog.Event) {
+			e.Str("test-log", "ok")
 		})
 }

v2/result/result.go

@@ -7,11 +7,9 @@ import (
 
 	"github.com/rs/zerolog"
 	"github.com/samber/lo"
-	"google.golang.org/protobuf/encoding/prototext"
 
 	"github.com/pubgo/funk"
 	"github.com/pubgo/funk/errors"
-	"github.com/pubgo/funk/log"
 )
 
 var _ Catchable = new(Result[any])
@@ -108,33 +106,12 @@ func (r Result[T]) Inspect(fn func(T)) Result[T] {
 }
 
 func (r Result[T]) LogCtx(ctx context.Context, events ...func(e *zerolog.Event)) Result[T] {
-	if r.IsErr() {
-		err := r.err
-		log.Error(ctx).
-			Func(func(e *zerolog.Event) {
-				for _, fn := range events {
-					fn(e)
-				}
-			}).
-			Str(zerolog.ErrorFieldName, err.Error()).
-			CallerSkipFrame(1).
-			Str("error_id", errors.GetErrorId(err)).
-			Msgf("%s\n%s", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
-	}
-
+	logErr(ctx, r.err, events...)
 	return r
 }
 
-func (r Result[T]) Log(contexts ...context.Context) Result[T] {
-	if r.IsErr() {
-		err := r.err
-		log.Error(contexts...).
-			Str(zerolog.ErrorFieldName, err.Error()).
-			CallerSkipFrame(1).
-			Str("error_id", errors.GetErrorId(err)).
-			Msgf("%s\n%s", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
-	}
-
+func (r Result[T]) Log(events ...func(e *zerolog.Event)) Result[T] {
+	logErr(nil, r.err, events...)
 	return r
 }
 

v2/result/util.go

@@ -3,13 +3,16 @@ package result
 import (
 	"context"
 	"fmt"
+
 	"log/slog"
 	"reflect"
 	"runtime/debug"
 	"strings"
 
+	"github.com/rs/zerolog"
 	"github.com/samber/lo"
-	
+	"google.golang.org/protobuf/encoding/prototext"
+
 	"github.com/pubgo/funk/errors"
 	"github.com/pubgo/funk/generic"
 	"github.com/pubgo/funk/log"
@@ -232,3 +235,23 @@ func setError(setter ErrSetter, err error) {
 		ret.err = err
 	}
 }
+
+func logErr(ctx context.Context, err error, events ...func(e *zerolog.Event)) {
+	if err == nil {
+		return
+	}
+
+	log.Error(ctx).
+		Func(func(e *zerolog.Event) {
+			for _, fn := range events {
+				fn(e)
+			}
+
+			if id := errors.GetErrorId(err); id != "" {
+				e.Str("error_id", id)
+			}
+		}).
+		Str(zerolog.ErrorFieldName, err.Error()).
+		CallerSkipFrame(2).
+		Msgf("%s\n%s", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
+}