Remove log prefix wrapping for json logs (#1451)

Author: ceyonur

utils/logging/factory.go

@@ -87,8 +87,9 @@ func (f *factory) makeLogger(config Config) (Logger, error) {
 		Compress:   config.Compress,
 	}
 	fileCore := NewWrappedCore(config.LogLevel, rw, fileEnc)
+	prefix := config.LogFormat.WrapPrefix(config.MsgPrefix)
 
-	l := NewLogger(config.Assertions, config.MsgPrefix, consoleCore, fileCore)
+	l := NewLogger(config.Assertions, prefix, consoleCore, fileCore)
 	f.loggers[config.LoggerName] = logWrapper{
 		logger:       l,
 		displayLevel: consoleCore.AtomicLevel,

utils/logging/format.go

@@ -80,6 +80,13 @@ func (f Format) MarshalJSON() ([]byte, error) {
 	}
 }
 
+func (f Format) WrapPrefix(prefix string) string {
+	if prefix == "" || f == JSON {
+		return prefix
+	}
+	return fmt.Sprintf("<%s>", prefix)
+}
+
 func (f Format) ConsoleEncoder() zapcore.Encoder {
 	switch f {
 	case Colors:

utils/logging/log.go

@@ -41,7 +41,6 @@ func newZapLogger(prefix string, wrappedCores ...WrappedCore) *zap.Logger {
 	core := zapcore.NewTee(cores...)
 	logger := zap.New(core, zap.AddCaller(), zap.AddCallerSkip(2))
 	if prefix != "" {
-		prefix := fmt.Sprintf("<%s>", prefix)
 		logger = logger.Named(prefix)
 	}