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

server/channels/app/job_test.go

@@ -11,23 +11,27 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/request"
 	"github.com/mattermost/mattermost/server/v8/channels/store/sqlstore"
 )
 
 func TestGetJob(t *testing.T) {
 	th := Setup(t)
 	defer th.TearDown()
+	ctx := request.EmptyContext(th.TestLogger)
 
 	status := &model.Job{
 		Id:     model.NewId(),
 		Status: model.NewId(),
 	}
+	status.InitLogger(th.TestLogger)
+
 	_, err := th.App.Srv().Store().Job().Save(status)
 	require.NoError(t, err)
 
 	defer th.App.Srv().Store().Job().Delete(status.Id)
 
-	received, appErr := th.App.GetJob(status.Id)
+	received, appErr := th.App.GetJob(ctx, status.Id)
 	require.Nil(t, appErr)
 	require.Equal(t, status, received, "incorrect job status received")
 }
@@ -216,6 +220,7 @@ func TestSessionHasPermissionToReadJob(t *testing.T) {
 func TestGetJobByType(t *testing.T) {
 	th := Setup(t)
 	defer th.TearDown()
+	ctx := request.EmptyContext(th.TestLogger)
 
 	jobType := model.NewId()
 
@@ -238,18 +243,20 @@ func TestGetJobByType(t *testing.T) {
 	}
 
 	for _, status := range statuses {
+		status.InitLogger(th.TestLogger)
+
 		_, err := th.App.Srv().Store().Job().Save(status)
 		require.NoError(t, err)
 		defer th.App.Srv().Store().Job().Delete(status.Id)
 	}
 
-	received, err := th.App.GetJobsByType(jobType, 0, 2)
+	received, err := th.App.GetJobsByType(ctx, jobType, 0, 2)
 	require.Nil(t, err)
 	require.Len(t, received, 2, "received wrong number of statuses")
 	require.Equal(t, statuses[2], received[0], "should've received newest job first")
 	require.Equal(t, statuses[0], received[1], "should've received second newest job second")
 
-	received, err = th.App.GetJobsByType(jobType, 2, 2)
+	received, err = th.App.GetJobsByType(ctx, jobType, 2, 2)
 	require.Nil(t, err)
 	require.Len(t, received, 1, "received wrong number of statuses")
 	require.Equal(t, statuses[1], received[0], "should've received oldest job last")
@@ -258,6 +265,7 @@ func TestGetJobByType(t *testing.T) {
 func TestGetJobsByTypes(t *testing.T) {
 	th := Setup(t)
 	defer th.TearDown()
+	ctx := request.EmptyContext(th.TestLogger)
 
 	jobType := model.NewId()
 	jobType1 := model.NewId()
@@ -282,25 +290,27 @@ func TestGetJobsByTypes(t *testing.T) {
 	}
 
 	for _, status := range statuses {
+		status.InitLogger(th.TestLogger)
+
 		_, err := th.App.Srv().Store().Job().Save(status)
 		require.NoError(t, err)
 		defer th.App.Srv().Store().Job().Delete(status.Id)
 	}
 
 	jobTypes := []string{jobType, jobType1, jobType2}
-	received, err := th.App.GetJobsByTypes(jobTypes, 0, 2)
+	received, err := th.App.GetJobsByTypes(ctx, jobTypes, 0, 2)
 	require.Nil(t, err)
 	require.Len(t, received, 2, "received wrong number of jobs")
 	require.Equal(t, statuses[2], received[0], "should've received newest job first")
 	require.Equal(t, statuses[0], received[1], "should've received second newest job second")
 
-	received, err = th.App.GetJobsByTypes(jobTypes, 2, 2)
+	received, err = th.App.GetJobsByTypes(ctx, jobTypes, 2, 2)
 	require.Nil(t, err)
 	require.Len(t, received, 1, "received wrong number of jobs")
 	require.Equal(t, statuses[1], received[0], "should've received oldest job last")
 
 	jobTypes = []string{jobType1, jobType2}
-	received, err = th.App.GetJobsByTypes(jobTypes, 0, 3)
+	received, err = th.App.GetJobsByTypes(ctx, jobTypes, 0, 3)
 	require.Nil(t, err)
 	require.Len(t, received, 2, "received wrong number of jobs")
 	require.Equal(t, statuses[2], received[0], "received wrong job type")