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

server/channels/jobs/product_notices/scheduler.go

@@ -19,7 +19,7 @@ func (scheduler *Scheduler) NextScheduleTime(cfg *model.Config, _ time.Time, pen
 	return &nextTime
 }
 
-func MakeScheduler(jobServer *jobs.JobServer) model.Scheduler {
+func MakeScheduler(jobServer *jobs.JobServer) *Scheduler {
 	isEnabled := func(cfg *model.Config) bool {
 		return *cfg.AnnouncementSettings.AdminNoticesEnabled || *cfg.AnnouncementSettings.UserNoticesEnabled
 	}

server/channels/jobs/product_notices/worker.go

@@ -9,13 +9,13 @@ import (
 	"github.com/mattermost/mattermost/server/v8/channels/jobs"
 )
 
-const jobName = "ProductNotices"
-
 type AppIface interface {
 	UpdateProductNotices() *model.AppError
 }
 
-func MakeWorker(jobServer *jobs.JobServer, app AppIface) model.Worker {
+func MakeWorker(jobServer *jobs.JobServer, app AppIface) *jobs.SimpleWorker {
+	const workerName = "ProductNotices"
+
 	isEnabled := func(cfg *model.Config) bool {
 		return *cfg.AnnouncementSettings.AdminNoticesEnabled || *cfg.AnnouncementSettings.UserNoticesEnabled
 	}
@@ -23,11 +23,11 @@ func MakeWorker(jobServer *jobs.JobServer, app AppIface) model.Worker {
 		defer jobServer.HandleJobPanic(job)
 
 		if err := app.UpdateProductNotices(); err != nil {
-			mlog.Error("Worker: Failed to fetch product notices", mlog.String("worker", model.JobTypeProductNotices), mlog.String("job_id", job.Id), mlog.Err(err))
+			job.Logger.Error("Worker: Failed to fetch product notices", mlog.Err(err))
 			return err
 		}
 		return nil
 	}
-	worker := jobs.NewSimpleWorker(jobName, jobServer, execute, isEnabled)
+	worker := jobs.NewSimpleWorker(workerName, jobServer, execute, isEnabled)
 	return worker
 }