Fix data race with logging

common/frame_session.go

@@ -72,8 +72,6 @@ type FrameSession struct {
 	vu            k6modules.VU
 
 	logger *log.Logger
-	// logger that will properly serialize RemoteObject instances
-	serializer *log.Logger
 
 	// Keep a reference to the main frame span so we can end it
 	// when FrameSession.ctx is Done
@@ -105,7 +103,6 @@ func NewFrameSession(
 		vu:                   k6ext.GetVU(ctx),
 		k6Metrics:            k6Metrics,
 		logger:               l,
-		serializer:           l.ConsoleLogFormatterSerializer(),
 	}
 
 	var parentNM *NetworkManager
@@ -612,7 +609,7 @@ func (fs *FrameSession) navigateFrame(frame *Frame, url, referrer string) (strin
 }
 
 func (fs *FrameSession) onConsoleAPICalled(event *cdpruntime.EventConsoleAPICalled) {
-	l := fs.serializer.
+	l := fs.logger.
 		WithTime(event.Timestamp.Time()).
 		WithField("source", "browser").
 		WithField("browser_source", "console-api")
@@ -632,19 +629,19 @@ func (fs *FrameSession) onConsoleAPICalled(event *cdpruntime.EventConsoleAPICall
 		parsedObjects = append(parsedObjects, s)
 	}
 
-	l = l.WithField("stringObjects", parsedObjects)
+	msg := strings.Join(parsedObjects, " ")
 
 	switch event.Type {
 	case "log", "info":
-		l.Info()
+		l.Info(msg)
 	case "warning":
-		l.Warn()
+		l.Warn(msg)
 	case "error":
-		l.Error()
+		l.Error(msg)
 	default:
 		// this is where debug & other console.* apis will default to (such as
 		// console.table).
-		l.Debug()
+		l.Debug(msg)
 	}
 }
 

log/logger.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"regexp"
 	"runtime"
-	"strings"
 	"sync"
 	"time"
 
@@ -152,19 +151,6 @@ func (l *Logger) ReportCaller() {
 	l.SetReportCaller(true)
 }
 
-// ConsoleLogFormatterSerializer creates a new logger that will
-// correctly serialize RemoteObject instances.
-func (l *Logger) ConsoleLogFormatterSerializer() *Logger {
-	return &Logger{
-		Logger: &logrus.Logger{
-			Out:       l.Out,
-			Level:     l.Level,
-			Formatter: &consoleLogFormatter{l.Formatter},
-			Hooks:     l.Hooks,
-		},
-	}
-}
-
 // SetCategoryFilter enables filtering logs by the filter regex.
 func (l *Logger) SetCategoryFilter(filter string) (err error) {
 	if filter == "" {
@@ -175,17 +161,3 @@ func (l *Logger) SetCategoryFilter(filter string) (err error) {
 	}
 	return nil
 }
-
-type consoleLogFormatter struct {
-	logrus.Formatter
-}
-
-// Format assembles a message from marshalling elements in the "objects" field
-// to JSON separated by space, and deletes the field when done.
-func (f *consoleLogFormatter) Format(entry *logrus.Entry) ([]byte, error) {
-	if stringObjects, ok := entry.Data["stringObjects"].([]string); ok {
-		entry.Message = strings.Join(stringObjects, " ")
-		delete(entry.Data, "stringObjects")
-	}
-	return f.Formatter.Format(entry)
-}