testhelper: Return our own logger instead of `logrus.FieldLogger`

Refactor out testhelper functions that create a logger to return our own
internal `log.LogrusLogger` instead of a `logrus.FieldLogger`. Add an
abstraction layer around adding hooks into the logger such that tests
don't need to reach into the logrus logger in general.

1 files changed, 2 insertions, 3 deletions

diff --git a/internal/praefect/repocleaner/repository_test.go b/internal/praefect/repocleaner/repository_test.go
index 9af5e2941..86fe0cbed 100644
--- a/internal/praefect/repocleaner/repository_test.go
+++ b/internal/praefect/repocleaner/repository_test.go
@@ -262,9 +262,8 @@ func TestRunner_Run_noAvailableStorages(t *testing.T) {
 	}
 
 	logger := testhelper.SharedLogger(t)
-	entry := logger.WithContext(ctx)
-	clientHandshaker := backchannel.NewClientHandshaker(entry, praefect.NewBackchannelServerFactory(entry, transaction.NewServer(nil), nil), backchannel.DefaultConfiguration())
-	nodeSet, err := praefect.DialNodes(ctx, conf.VirtualStorages, protoregistry.GitalyProtoPreregistered, nil, clientHandshaker, nil, testhelper.SharedLogger(t))
+	clientHandshaker := backchannel.NewClientHandshaker(logger, praefect.NewBackchannelServerFactory(logger, transaction.NewServer(nil), nil), backchannel.DefaultConfiguration())
+	nodeSet, err := praefect.DialNodes(ctx, conf.VirtualStorages, protoregistry.GitalyProtoPreregistered, nil, clientHandshaker, nil, logger)
 	require.NoError(t, err)
 	defer nodeSet.Close()