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

server/channels/app/job.go

@@ -8,11 +8,12 @@ import (
 	"net/http"
 
 	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/request"
 	"github.com/mattermost/mattermost/server/v8/channels/store"
 )
 
-func (a *App) GetJob(id string) (*model.Job, *model.AppError) {
-	job, err := a.Srv().Store().Job().Get(id)
+func (a *App) GetJob(c *request.Context, id string) (*model.Job, *model.AppError) {
+	job, err := a.Srv().Store().Job().Get(c, id)
 	if err != nil {
 		var nfErr *store.ErrNotFound
 		switch {
@@ -26,25 +27,12 @@ func (a *App) GetJob(id string) (*model.Job, *model.AppError) {
 	return job, nil
 }
 
-func (a *App) GetJobsPage(page int, perPage int) ([]*model.Job, *model.AppError) {
-	return a.GetJobs(page*perPage, perPage)
+func (a *App) GetJobsByTypePage(c *request.Context, jobType string, page int, perPage int) ([]*model.Job, *model.AppError) {
+	return a.GetJobsByType(c, jobType, page*perPage, perPage)
 }
 
-func (a *App) GetJobs(offset int, limit int) ([]*model.Job, *model.AppError) {
-	jobs, err := a.Srv().Store().Job().GetAllPage(offset, limit)
-	if err != nil {
-		return nil, model.NewAppError("GetJobs", "app.job.get_all.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
-	}
-
-	return jobs, nil
-}
-
-func (a *App) GetJobsByTypePage(jobType string, page int, perPage int) ([]*model.Job, *model.AppError) {
-	return a.GetJobsByType(jobType, page*perPage, perPage)
-}
-
-func (a *App) GetJobsByType(jobType string, offset int, limit int) ([]*model.Job, *model.AppError) {
-	jobs, err := a.Srv().Store().Job().GetAllByTypePage(jobType, offset, limit)
+func (a *App) GetJobsByType(c *request.Context, jobType string, offset int, limit int) ([]*model.Job, *model.AppError) {
+	jobs, err := a.Srv().Store().Job().GetAllByTypePage(c, jobType, offset, limit)
 	if err != nil {
 		return nil, model.NewAppError("GetJobsByType", "app.job.get_all.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
@@ -52,24 +40,24 @@ func (a *App) GetJobsByType(jobType string, offset int, limit int) ([]*model.Job
 	return jobs, nil
 }
 
-func (a *App) GetJobsByTypesPage(jobType []string, page int, perPage int) ([]*model.Job, *model.AppError) {
-	return a.GetJobsByTypes(jobType, page*perPage, perPage)
+func (a *App) GetJobsByTypesPage(c *request.Context, jobType []string, page int, perPage int) ([]*model.Job, *model.AppError) {
+	return a.GetJobsByTypes(c, jobType, page*perPage, perPage)
 }
 
-func (a *App) GetJobsByTypes(jobTypes []string, offset int, limit int) ([]*model.Job, *model.AppError) {
-	jobs, err := a.Srv().Store().Job().GetAllByTypesPage(jobTypes, offset, limit)
+func (a *App) GetJobsByTypes(c *request.Context, jobTypes []string, offset int, limit int) ([]*model.Job, *model.AppError) {
+	jobs, err := a.Srv().Store().Job().GetAllByTypesPage(c, jobTypes, offset, limit)
 	if err != nil {
 		return nil, model.NewAppError("GetJobsByType", "app.job.get_all.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
 	return jobs, nil
 }
 
-func (a *App) CreateJob(job *model.Job) (*model.Job, *model.AppError) {
-	return a.Srv().Jobs.CreateJob(job.Type, job.Data)
+func (a *App) CreateJob(c *request.Context, job *model.Job) (*model.Job, *model.AppError) {
+	return a.Srv().Jobs.CreateJob(c, job.Type, job.Data)
 }
 
-func (a *App) CancelJob(jobId string) *model.AppError {
-	return a.Srv().Jobs.RequestCancellation(jobId)
+func (a *App) CancelJob(c *request.Context, jobId string) *model.AppError {
+	return a.Srv().Jobs.RequestCancellation(c, jobId)
 }
 
 func (a *App) SessionHasPermissionToCreateJob(session model.Session, job *model.Job) (bool, *model.Permission) {