make log thread safe

Author: CMGS

log/field.go

@@ -1,11 +1,15 @@
 package log
 
-import "context"
+import (
+	"context"
+
+	"github.com/alphadose/haxmap"
+)
 
 // Fields is a wrapper for zerolog.Entry
 // we need to insert some sentry captures here
 type Fields struct {
-	kv map[string]interface{}
+	kv *haxmap.Map[string, interface{}]
 }
 
 // WithFunc is short for WithField
@@ -15,14 +19,16 @@ func WithFunc(fname string) *Fields {
 
 // WithField add kv into log entry
 func WithField(key string, value interface{}) *Fields {
+	r := haxmap.New[string, interface{}]()
+	r.Set(key, value)
 	return &Fields{
-		kv: map[string]interface{}{key: value},
+		kv: r,
 	}
 }
 
 // WithField .
 func (f *Fields) WithField(key string, value interface{}) *Fields {
-	f.kv[key] = value
+	f.kv.Set(key, value)
 	return f
 }
 

log/inner.go

@@ -3,37 +3,44 @@ package log
 import (
 	"context"
 
+	"github.com/alphadose/haxmap"
 	"github.com/getsentry/sentry-go"
+	"github.com/rs/zerolog"
 )
 
-func fatalf(ctx context.Context, err error, format string, fields map[string]interface{}, args ...interface{}) {
+func fatalf(ctx context.Context, err error, format string, fields *haxmap.Map[string, interface{}], args ...interface{}) {
 	args = argsValidate(args)
 	reportToSentry(ctx, sentry.LevelFatal, err, format, args...)
-	globalLogger.Fatal().Fields(fields).Err(err).Msgf(format, args...)
+	f := globalLogger.Fatal()
+	wrap(f, fields).Err(err).Msgf(format, args...)
 }
 
-func warnf(_ context.Context, format string, fields map[string]interface{}, args ...interface{}) {
+func warnf(_ context.Context, format string, fields *haxmap.Map[string, interface{}], args ...interface{}) {
 	args = argsValidate(args)
-	globalLogger.Warn().Fields(fields).Msgf(format, args...)
+	f := globalLogger.Warn()
+	wrap(f, fields).Msgf(format, args...)
 }
 
-func infof(_ context.Context, format string, fields map[string]interface{}, args ...interface{}) {
+func infof(_ context.Context, format string, fields *haxmap.Map[string, interface{}], args ...interface{}) {
 	args = argsValidate(args)
-	globalLogger.Info().Fields(fields).Msgf(format, args...)
+	f := globalLogger.Info()
+	wrap(f, fields).Msgf(format, args...)
 }
 
-func debugf(_ context.Context, format string, fields map[string]interface{}, args ...interface{}) {
+func debugf(_ context.Context, format string, fields *haxmap.Map[string, interface{}], args ...interface{}) {
 	args = argsValidate(args)
-	globalLogger.Debug().Fields(fields).Msgf(format, args...)
+	f := globalLogger.Debug()
+	wrap(f, fields).Msgf(format, args...)
 }
 
-func errorf(ctx context.Context, err error, format string, fields map[string]interface{}, args ...interface{}) {
+func errorf(ctx context.Context, err error, format string, fields *haxmap.Map[string, interface{}], args ...interface{}) {
 	if err == nil {
 		return
 	}
 	args = argsValidate(args)
 	reportToSentry(ctx, sentry.LevelError, err, format, args...)
-	globalLogger.Error().Fields(fields).Stack().Err(err).Msgf(format, args...)
+	f := globalLogger.Error()
+	wrap(f, fields).Stack().Err(err).Msgf(format, args...)
 }
 
 func argsValidate(args []interface{}) []interface{} {
@@ -42,3 +49,14 @@ func argsValidate(args []interface{}) []interface{} {
 	}
 	return []interface{}{""}
 }
+
+func wrap(f *zerolog.Event, kv *haxmap.Map[string, interface{}]) *zerolog.Event {
+	if kv == nil {
+		return f
+	}
+	kv.ForEach(func(k string, v interface{}) bool {
+		f = f.Interface(k, v)
+		return true
+	})
+	return f
+}