Refactor null logger in common

Author: inancgumus

common/barrier_test.go

@@ -31,7 +31,7 @@ import (
 func TestBarrier(t *testing.T) {
 	ctx := context.Background()
 
-	log := NewLogger(ctx, NullLogger(), false, nil)
+	log := NewNullLogger()
 
 	timeoutSetings := NewTimeoutSettings(nil)
 	frameManager := NewFrameManager(ctx, nil, nil, timeoutSetings, log)

common/connection_test.go

@@ -43,7 +43,7 @@ func TestConnection(t *testing.T) {
 		ctx := context.Background()
 		url, _ := url.Parse(server.ServerHTTP.URL)
 		wsURL := fmt.Sprintf("ws://%s/echo", url.Host)
-		conn, err := NewConnection(ctx, wsURL, NewLogger(ctx, NullLogger(), false, nil))
+		conn, err := NewConnection(ctx, wsURL, NewNullLogger())
 		conn.Close()
 
 		require.NoError(t, err)
@@ -58,7 +58,7 @@ func TestConnectionClosureAbnormal(t *testing.T) {
 		ctx := context.Background()
 		url, _ := url.Parse(server.ServerHTTP.URL)
 		wsURL := fmt.Sprintf("ws://%s/closure-abnormal", url.Host)
-		conn, err := NewConnection(ctx, wsURL, NewLogger(ctx, NullLogger(), false, nil))
+		conn, err := NewConnection(ctx, wsURL, NewNullLogger())
 
 		if assert.NoError(t, err) {
 			action := target.SetDiscoverTargets(true)
@@ -76,7 +76,7 @@ func TestConnectionSendRecv(t *testing.T) {
 		ctx := context.Background()
 		url, _ := url.Parse(server.ServerHTTP.URL)
 		wsURL := fmt.Sprintf("ws://%s/cdp", url.Host)
-		conn, err := NewConnection(ctx, wsURL, NewLogger(ctx, NullLogger(), false, nil))
+		conn, err := NewConnection(ctx, wsURL, NewNullLogger())
 
 		if assert.NoError(t, err) {
 			action := target.SetDiscoverTargets(true)
@@ -140,7 +140,7 @@ func TestConnectionCreateSession(t *testing.T) {
 		ctx := context.Background()
 		url, _ := url.Parse(server.ServerHTTP.URL)
 		wsURL := fmt.Sprintf("ws://%s/cdp", url.Host)
-		conn, err := NewConnection(ctx, wsURL, NewLogger(ctx, NullLogger(), false, nil))
+		conn, err := NewConnection(ctx, wsURL, NewNullLogger())
 
 		if assert.NoError(t, err) {
 			session, err := conn.createSession(&target.Info{

common/frame_test.go

@@ -36,10 +36,10 @@ func TestFrameNilDocument(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	logger := NewLogger(ctx, NullLogger(), false, nil)
+	log := NewNullLogger()
 
-	fm := NewFrameManager(ctx, nil, nil, nil, logger)
-	frame := NewFrame(ctx, fm, nil, cdp.FrameID("42"), logger)
+	fm := NewFrameManager(ctx, nil, nil, nil, log)
+	frame := NewFrame(ctx, fm, nil, cdp.FrameID("42"), log)
 
 	// frame should not panic with a nil document
 	stub := &executionContextTestStub{

common/helpers_test.go

@@ -143,7 +143,7 @@ func TestConvertArgument(t *testing.T) {
 
 	t.Run("*BaseJSHandle", func(t *testing.T) {
 		execCtx, ctx, rt := newExecCtx()
-		log := NewLogger(ctx, NullLogger(), false, nil)
+		log := NewNullLogger()
 
 		timeoutSetings := NewTimeoutSettings(nil)
 		frameManager := NewFrameManager(ctx, nil, nil, timeoutSetings, log)
@@ -166,7 +166,7 @@ func TestConvertArgument(t *testing.T) {
 
 	t.Run("*BaseJSHandle wrong context", func(t *testing.T) {
 		execCtx, ctx, rt := newExecCtx()
-		log := NewLogger(ctx, NullLogger(), false, nil)
+		log := NewNullLogger()
 
 		timeoutSetings := NewTimeoutSettings(nil)
 		frameManager := NewFrameManager(ctx, nil, nil, timeoutSetings, log)
@@ -188,7 +188,7 @@ func TestConvertArgument(t *testing.T) {
 
 	t.Run("*BaseJSHandle is disposed", func(t *testing.T) {
 		execCtx, ctx, rt := newExecCtx()
-		log := NewLogger(ctx, NullLogger(), false, nil)
+		log := NewNullLogger()
 
 		timeoutSetings := NewTimeoutSettings(nil)
 		frameManager := NewFrameManager(ctx, nil, nil, timeoutSetings, log)
@@ -210,7 +210,7 @@ func TestConvertArgument(t *testing.T) {
 
 	t.Run("*BaseJSHandle as *ElementHandle", func(t *testing.T) {
 		execCtx, ctx, rt := newExecCtx()
-		log := NewLogger(ctx, NullLogger(), false, nil)
+		log := NewNullLogger()
 
 		timeoutSetings := NewTimeoutSettings(nil)
 		frameManager := NewFrameManager(ctx, nil, nil, timeoutSetings, log)

common/logger.go

@@ -51,6 +51,10 @@ func NullLogger() *logrus.Logger {
 	return log
 }
 
+func NewNullLogger() *Logger {
+	return NewLogger(context.TODO(), NullLogger(), false, nil)
+}
+
 func NewLogger(ctx context.Context, logger *logrus.Logger, debugOverride bool, categoryFilter *regexp.Regexp) *Logger {
 	return &Logger{
 		ctx:            ctx,

common/session_test.go

@@ -77,7 +77,7 @@ func TestSessionCreateSession(t *testing.T) {
 		ctx := context.Background()
 		url, _ := url.Parse(server.ServerHTTP.URL)
 		wsURL := fmt.Sprintf("ws://%s/cdp", url.Host)
-		conn, err := NewConnection(ctx, wsURL, NewLogger(ctx, NullLogger(), false, nil))
+		conn, err := NewConnection(ctx, wsURL, NewNullLogger())
 
 		if assert.NoError(t, err) {
 			session, err := conn.createSession(&target.Info{