chore: quick update fix/version at 2025-11-05 11:36:59

Author: kooksee

cmds/protoc-gen-go-errors2/internal/gen.go

@@ -25,9 +25,9 @@ func GenerateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
 	g := gen.NewGeneratedFile(filename, file.GoImportPath)
 
 	genFile := jen.NewFile(string(file.GoPackageName))
-	genFile.HeaderComment("Code generated by protoc-gen-go-errors. DO NOT EDIT.")
+	genFile.HeaderComment("Code generated by protoc-gen-go-errors2. DO NOT EDIT.")
 	genFile.HeaderComment("versions:")
-	genFile.HeaderComment(fmt.Sprintf("- protoc-gen-go-errors %s", version))
+	genFile.HeaderComment(fmt.Sprintf("- protoc-gen-go-errors2 %s", version))
 	genFile.HeaderComment(fmt.Sprintf("- protoc               %s", protocVersion(gen)))
 	if file.Proto.GetOptions().GetDeprecated() {
 		genFile.HeaderComment(fmt.Sprintf("%s is a deprecated file.", file.Desc.Path()))

cmds/protoc-gen-go-errors2/internal/version.go

@@ -1,3 +1,3 @@
 package internal
 
-const version = "v0.0.7"
+const version = "v0.0.8"

component/cloudevent/client.go

@@ -351,7 +351,7 @@ func (c *Client) doHandler(meta *jetstream.MsgMetadata, msg jetstream.Msg, job *
 	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	ctx = log.UpdateEventCtx(ctx, log.Map{
+	ctx = log.UpdateFieldsCtx(ctx, log.Fields{
 		"sub_subject":                 msg.Subject(),
 		"sub_stream":                  meta.Stream,
 		"sub_consumer":                meta.Consumer,

internal/example/log/main.go

@@ -14,7 +14,7 @@ func main() {
 }
 
 func demo(base log.Logger) {
-	l := base.WithName("MyName").WithName("dd").WithFields(log.Map{"user": "you"})
+	l := base.WithName("MyName").WithName("dd").WithFields(log.Fields{"user": "you"})
 	l.Info().Fields(map[string]any{"val1": 1, "val2": map[string]int{"k": 1}}).Msg("hello")
 	l.Err(nil).Fields(map[string]any{"trouble": true, "reasons": []float64{0.1, 0.11, 3.14}}).Msg("uh oh")
 	l.Err(fmt.Errorf("an error occurred")).Int("code", -1).Msg("goodbye")

log/aaa.go

@@ -7,16 +7,16 @@ import (
 )
 
 type (
-	Map           = map[string]any
+	Fields        = map[string]any
 	Hook          = zerolog.Hook
 	Event         = zerolog.Event
 	Level         = zerolog.Level
-	EnableChecker = func(ctx context.Context, lvl Level, name, message string, fields Map) bool
+	EnableChecker = func(ctx context.Context, lvl Level, name, message string, fields Fields) bool
 )
 
 type Logger interface {
 	WithName(name string) Logger
-	WithFields(m Map) Logger
+	WithFields(m Fields) Logger
 	WithCallerSkip(skip int) Logger
 	WithLevel(lvl Level) Logger
 

log/context.go

@@ -2,6 +2,7 @@ package log
 
 import (
 	"context"
+	"log"
 )
 
 type (
@@ -30,21 +31,21 @@ func GetFromCtx(ctx context.Context, loggers ...Logger) Logger {
 
 func CreateCtx(ctx context.Context, ll Logger) context.Context {
 	if ll == nil || ctx == nil {
-		panic("ctx or log param is nil")
+		log.Panicln("ctx or log param is nil")
 	}
 
 	return context.WithValue(ctx, ctxLoggerKey{}, ll)
 }
 
-func CreateEventCtx(ctx context.Context, evt *Event) context.Context {
+func CreateFieldsCtx(ctx context.Context, evt Fields) context.Context {
 	if evt == nil || ctx == nil {
-		panic("ctx or log event is nil")
+		log.Panicln("ctx or log event is nil")
 	}
 
 	return context.WithValue(ctx, ctxEventKey{}, evt)
 }
 
-func UpdateEventCtx(ctx context.Context, fields Map) context.Context {
+func UpdateFieldsCtx(ctx context.Context, fields Fields) context.Context {
 	if ctx == nil {
 		ctx = context.Background()
 	}
@@ -53,22 +54,20 @@ func UpdateEventCtx(ctx context.Context, fields Map) context.Context {
 		return ctx
 	}
 
-	evt := NewEvent()
-	if e := getEventFromCtx(ctx); e != nil {
+	evt := make(Fields)
+	if e := GetFieldsFromCtx(ctx); e != nil {
 		evt = e
-	} else {
-		ctx = context.WithValue(ctx, ctxEventKey{}, evt)
 	}
 
 	for k, v := range fields {
-		evt.Any(k, v)
+		evt[k] = v
 	}
 
-	return ctx
+	return context.WithValue(ctx, ctxEventKey{}, evt)
 }
 
-func getEventFromCtx(ctx context.Context) *Event {
-	evt, ok := ctx.Value(ctxEventKey{}).(*Event)
+func GetFieldsFromCtx(ctx context.Context) Fields {
+	evt, ok := ctx.Value(ctxEventKey{}).(Fields)
 	if ok {
 		return evt
 	}
@@ -89,7 +88,7 @@ func isLogDisabled(ctx context.Context) bool {
 }
 
 type fieldMap struct {
-	fields Map
+	fields Fields
 	name   string
 }
 

log/event.go

@@ -17,8 +17,8 @@ import (
 )
 
 var (
-	logEnableChecker EnableChecker
-	logGlobalHook    = zerolog.HookFunc(func(e *zerolog.Event, level zerolog.Level, message string) {
+	logEnableChecker    EnableChecker
+	logGlobalFilterHook = zerolog.HookFunc(func(e *zerolog.Event, level zerolog.Level, message string) {
 		if logEnableChecker == nil {
 			return
 		}
@@ -63,7 +63,7 @@ var (
 			Output(zerolog.NewConsoleWriter(func(w *zerolog.ConsoleWriter) {
 				w.Out = os.Stderr
 				w.TimeFormat = time.RFC3339
-			})).Hook(logGlobalHook),
+			})).Hook(logGlobalFilterHook),
 	)
 
 	_ = funk.Init(func() {
@@ -86,7 +86,7 @@ func GetLogger(names ...string) Logger {
 func SetLogger(log *zerolog.Logger) {
 	assert.If(log == nil, "[log] should not be nil")
 
-	log = lo.ToPtr(log.Hook(logGlobalHook))
+	log = lo.ToPtr(log.Hook(logGlobalFilterHook))
 
 	stdZeroLog = log
 	zlog.Logger = *log

log/event.s

@@ -23,8 +23,7 @@ func New(log *zerolog.Logger) Logger {
 type loggerImpl struct {
 	name       string
 	log        *zerolog.Logger
-	fields     Map
-	content    *Event
+	fields     Fields
 	callerSkip int
 	lvl        Level
 }
@@ -35,17 +34,6 @@ func (l *loggerImpl) WithLevel(lvl Level) Logger {
 	return log
 }
 
-func (l *loggerImpl) WithEvent(evt *Event) Logger {
-	if evt == nil {
-		return l
-	}
-
-	log := l.copy()
-	log.content = mergeEvent(l.content, evt)
-
-	return log
-}
-
 func (l *loggerImpl) WithCallerSkip(skip int) Logger {
 	if skip == 0 {
 		return l
@@ -64,7 +52,7 @@ func (l *loggerImpl) nameWithCaller(name string, caller int) Logger {
 
 	log := l.copy()
 	if log.fields == nil {
-		log.fields = make(Map, 1)
+		log.fields = make(Fields, 1)
 	}
 
 	if log.name == "" {
@@ -81,13 +69,13 @@ func (l *loggerImpl) WithName(name string) Logger {
 	return l.nameWithCaller(name, 0)
 }
 
-func (l *loggerImpl) WithFields(m Map) Logger {
+func (l *loggerImpl) WithFields(m Fields) Logger {
 	if len(m) == 0 {
 		return l
 	}
 
 	log := l.copy()
-	logFields := make(Map, len(m)+len(log.fields))
+	logFields := make(Fields, len(m)+len(log.fields))
 	for k, v := range m {
 		logFields[k] = v
 	}
@@ -197,7 +185,6 @@ func (l *loggerImpl) enabled(ctx context.Context, lvl zerolog.Level) bool {
 func (l *loggerImpl) copy() *loggerImpl {
 	return &loggerImpl{
 		log:        l.log,
-		content:    cloneEvent(l.content),
 		fields:     maps.Clone(l.fields),
 		lvl:        l.lvl,
 		name:       l.name,
@@ -214,7 +201,9 @@ func (l *loggerImpl) getLog() *zerolog.Logger {
 
 func (l *loggerImpl) newEvent(ctx context.Context, e *zerolog.Event) *zerolog.Event {
 	name := l.name
-	if m, ok := l.fields[logfields.Module].(string); ok {
+	fields := l.fields
+
+	if m, ok := fields[logfields.Module].(string); ok {
 		name = m
 	}
 
@@ -226,11 +215,14 @@ func (l *loggerImpl) newEvent(ctx context.Context, e *zerolog.Event) *zerolog.Ev
 		e = e.CallerSkipFrame(l.callerSkip)
 	}
 
-	if len(l.fields) > 0 {
-		e = e.Fields(l.fields)
+	for k, v := range GetFieldsFromCtx(ctx) {
+		fields[k] = v
 	}
 
-	e = e.Ctx(createFieldCtx(ctx, &fieldMap{name: name, fields: l.fields}))
+	if len(fields) > 0 {
+		e = e.Fields(fields)
+	}
 
-	return mergeEvent(e, getEventFromCtx(ctx), l.content)
+	e = e.Ctx(createFieldCtx(ctx, &fieldMap{name: name, fields: fields}))
+	return e
 }