fix: add (*statz.statusError).Format() for stacktrace (#97)

Author: ginokent

.bin/git-tag-mod.sh

@@ -44,13 +44,16 @@ __main__() {
   LogshInfo "$(printf "targets: %s" "${targets:-none}")"
   if [ -n "${targets:-}" ]; then
     while read -r mod; do
-      mod_tag="${mod:?}/${latest_git_tag:?}"
-      if git tag --sort=v:refname | grep -qE "^${mod_tag:?}$"; then
-        LogshInfo "$(printf "tag already exists: %s" "${mod_tag:?}")"
+      go_module_tag="${mod:?}/${latest_git_tag:?}"
+      if git tag --sort=v:refname | grep -qE "^${go_module_tag:?}$"; then
+        # skip
+        LogshInfo "$(printf "tag already exists: %s" "${go_module_tag:?}")"
         continue
       fi
-      git tag -a "${mod_tag:?}" -m "${mod_tag:?}" "${latest_git_tag_commit:?}"
+      # add tag
+      LogshExec git tag -a "${go_module_tag:?}" -m "${go_module_tag:?}" "${latest_git_tag_commit:?}"
     done <<<"${targets:?}"
+
     git push --tags
   fi
 }

errors/fmt.go

@@ -176,7 +176,7 @@ loop:
 			e.Format(s, verb)
 			break loop
 		default:
-			fmt.Fprint(s, e)
+			fmt.Fprintf(s, fmt.FormatString(s, verb), e)
 			break loop
 		}
 		if err == nil {

grpc/status/status.go

@@ -23,7 +23,7 @@ const (
 
 type statusError struct {
 	error
-	*status.Status
+	s      *status.Status
 	level  Level
 	logger Logger
 }
@@ -44,14 +44,14 @@ func WithLogger(handler Logger) ErrorOption { //nolint:ireturn
 }
 
 func (o *newOptionDetails) apply(e *statusError) {
-	statusWithDetails, err := e.WithDetails(o.details...)
+	statusWithDetails, err := e.s.WithDetails(o.details...)
 	if err != nil {
-		err = errorz.NewErrorf(errorz.WithCallerSkip(2))("e.WithDetails: details=%v: %w", o.details, err)
+		err = errorz.NewErrorf(errorz.WithCallerSkip(2))("e.s.WithDetails: details=%v: %w", o.details, err)
 		e.logger(context.Background(), ErrorLevel, status.New(codes.Unknown, "WithDetails failed"), err)
 		return
 	}
 
-	e.Status = statusWithDetails
+	e.s = statusWithDetails
 }
 
 func WithDetails(details ...protoiface.MessageV1) ErrorOption { //nolint:ireturn
@@ -64,19 +64,33 @@ var (
 	DefaultLogger Logger = func(_ context.Context, level Level, stat *status.Status, err error) {
 		log.Printf("level=%s code=%s message=%q details=%s error=%q stacktrace=%q", level, stat.Code(), stat.Message(), stat.Details(), fmt.Sprintf("%v", err), fmt.Sprintf("%+v", err))
 	}
-	errorf = errorz.NewErrorf(errorz.WithCallerSkip(1))
+	_      interface{ GRPCStatus() *status.Status } = (*statusError)(nil)
+	errorf                                          = errorz.NewErrorf(errorz.WithCallerSkip(1))
 )
 
 func New(ctx context.Context, level Level, code codes.Code, msg string, err error, opts ...ErrorOption) error {
 	e := &statusError{
 		error:  errorf("errgrpc.New: level=%s code=%s message=%s: %w", level, code, msg, err),
-		Status: status.New(code, msg),
+		s:      status.New(code, msg),
 		level:  level,
 		logger: DefaultLogger,
 	}
 	for _, opt := range opts {
 		opt.apply(e)
 	}
-	e.logger(ctx, e.level, e.Status, err)
-	return errorf("%s: %s", msg, err)
+	e.logger(ctx, e.level, e.s, err)
+	return e
+}
+
+func (e *statusError) Format(s fmt.State, verb rune) {
+	if formatter, ok := e.error.(fmt.Formatter); ok { //nolint:errorlint
+		formatter.Format(s, verb)
+		return
+	}
+
+	_, _ = fmt.Fprintf(s, fmt.FormatString(s, verb), e.error)
+}
+
+func (e *statusError) GRPCStatus() *status.Status {
+	return e.s
 }

grpc/status/status_test.go

@@ -1,15 +1,16 @@
-package statz_test
+package statz
 
 import (
 	"context"
+	"errors"
 	"io"
 	"testing"
 
 	"google.golang.org/genproto/googleapis/rpc/errdetails"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	errorz "github.com/kunitsucom/util.go/errors"
-	statz "github.com/kunitsucom/util.go/grpc/status"
 )
 
 func TestNew(t *testing.T) {
@@ -20,9 +21,21 @@ func TestNew(t *testing.T) {
 
 		ctx := context.Background()
 		before := errorz.Errorf("err: %w", io.ErrUnexpectedEOF)
-		err := statz.New(ctx, statz.ErrorLevel, codes.Internal, "my error message", before, statz.WithDetails(&errdetails.DebugInfo{StackEntries: []string{"stack1", "stack2"}}), statz.WithDetails(nil), statz.WithLogger(statz.DefaultLogger))
+		err := New(ctx, ErrorLevel, codes.Internal, "my error message", before, WithDetails(&errdetails.DebugInfo{StackEntries: []string{"stack1", "stack2"}}), WithDetails(nil), WithLogger(DefaultLogger))
 		t.Logf("🪲: [%%v]:\n%v", err)
 		t.Logf("🪲: [%%+v]:\n%+v", err)
-		_ = statz.New(ctx, statz.ErrorLevel, codes.Internal, "my error message", before, statz.WithLogger(statz.DiscardLogger))
+
+		var e *statusError
+		if !errors.As(err, &e) {
+			t.Errorf("❌: something wrong")
+		}
+		e.error = io.ErrUnexpectedEOF
+		t.Logf("🪲: [%%v]:\n%v", e)
+
+		s, ok := New(ctx, ErrorLevel, codes.Internal, "my error message", io.ErrUnexpectedEOF, WithLogger(DiscardLogger)).(interface{ GRPCStatus() *status.Status }) //nolint:errorlint
+		if !ok {
+			t.Errorf("❌: New: not implement interface{ GRPCStatus() *status.Status }")
+		}
+		t.Logf("🪲: [%%v]:\n%v", s.GRPCStatus())
 	})
 }