[MM-54132] Use annotated logger for log messages from jobs (#24275)

server/platform/services/remotecluster/mocks_test.go

@@ -5,6 +5,7 @@ package remotecluster
 
 import (
 	"context"
+	"testing"
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/plugin/plugintest/mock"
@@ -20,12 +21,12 @@ type mockServer struct {
 	user    *model.User
 }
 
-func newMockServer(remotes []*model.RemoteCluster) *mockServer {
-	testLogger := mlog.CreateConsoleTestLogger(true, mlog.LvlDebug)
+func newMockServer(t *testing.T, remotes []*model.RemoteCluster) *mockServer {
+	logger := mlog.CreateConsoleTestLogger(t)
 
 	return &mockServer{
 		remotes: remotes,
-		logger:  testLogger,
+		logger:  logger,
 	}
 }
 
@@ -59,4 +60,3 @@ func (ms *mockServer) GetStore() store.Store {
 	storeMock.On("User").Return(userStoreMock)
 	return storeMock
 }
-func (ms *mockServer) Shutdown() { ms.logger.Shutdown() }

server/platform/services/remotecluster/ping_test.go

@@ -66,8 +66,7 @@ func TestPing(t *testing.T) {
 		}))
 		defer ts.Close()
 
-		mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
-		defer mockServer.Shutdown()
+		mockServer := newMockServer(t, makeRemoteClusters(NumRemotes, ts.URL))
 
 		service, err := NewRemoteClusterService(mockServer)
 		require.NoError(t, err)
@@ -116,8 +115,7 @@ func TestPing(t *testing.T) {
 		}))
 		defer ts.Close()
 
-		mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
-		defer mockServer.Shutdown()
+		mockServer := newMockServer(t, makeRemoteClusters(NumRemotes, ts.URL))
 
 		service, err := NewRemoteClusterService(mockServer)
 		require.NoError(t, err)

server/platform/services/remotecluster/send_test.go

@@ -82,8 +82,7 @@ func TestBroadcastMsg(t *testing.T) {
 		}))
 		defer ts.Close()
 
-		mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
-		defer mockServer.Shutdown()
+		mockServer := newMockServer(t, makeRemoteClusters(NumRemotes, ts.URL))
 
 		service, err := NewRemoteClusterService(mockServer)
 		require.NoError(t, err)
@@ -139,8 +138,7 @@ func TestBroadcastMsg(t *testing.T) {
 		}))
 		defer ts.Close()
 
-		mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
-		defer mockServer.Shutdown()
+		mockServer := newMockServer(t, makeRemoteClusters(NumRemotes, ts.URL))
 
 		service, err := NewRemoteClusterService(mockServer)
 		require.NoError(t, err)

server/platform/services/remotecluster/sendprofileImage_test.go

@@ -100,8 +100,7 @@ func TestService_sendProfileImageToRemote(t *testing.T) {
 
 	provider := testImageProvider{}
 
-	mockServer := newMockServer(makeRemoteClusters(NumRemotes, ts.URL))
-	defer mockServer.Shutdown()
+	mockServer := newMockServer(t, makeRemoteClusters(NumRemotes, ts.URL))
 	mockServer.SetUser(user)
 	service, err := NewRemoteClusterService(mockServer)
 	require.NoError(t, err)

server/platform/services/remotecluster/service_test.go

@@ -29,8 +29,7 @@ func TestService_AddTopicListener(t *testing.T) {
 		return nil
 	}
 
-	mockServer := newMockServer(makeRemoteClusters(NumRemotes, ""))
-	defer mockServer.Shutdown()
+	mockServer := newMockServer(t, makeRemoteClusters(NumRemotes, ""))
 
 	service, err := NewRemoteClusterService(mockServer)
 	require.NoError(t, err)