[pull] master from mattermost:master

server/channels/api4/system.go

@@ -703,15 +703,15 @@ func pushNotificationAck(c *Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	c.AppContext.WithLogger(c.AppContext.Logger().With(
+	c.AppContext = c.AppContext.WithLogFields(
 		mlog.String("type", model.NotificationTypePush),
 		mlog.String("ack_id", ack.Id),
 		mlog.String("push_type", ack.NotificationType),
 		mlog.String("post_id", ack.PostId),
 		mlog.String("ack_type", ack.NotificationType),
 		mlog.String("device_type", ack.ClientPlatform),
 		mlog.Int("received_at", ack.ClientReceivedAt),
-	))
+	)
 	err := c.App.SendAckToPushProxy(c.AppContext, &ack)
 	if ack.IsIdLoaded {
 		if err != nil {

server/channels/app/command.go

@@ -220,6 +220,7 @@ func (a *App) ExecuteCommand(rctx request.CTX, args *model.CommandArgs) (*model.
 	if !strings.HasPrefix(trigger, "/") {
 		return nil, model.NewAppError("command", "api.command.execute_command.format.app_error", map[string]any{"Trigger": trigger}, "", http.StatusBadRequest)
 	}
+
 	trigger = strings.TrimPrefix(trigger, "/")
 
 	clientTriggerId, triggerId, appErr := model.GenerateTriggerId(args.UserId, a.AsymmetricSigningKey())
@@ -470,7 +471,7 @@ func (a *App) tryExecuteCustomCommand(rctx request.CTX, args *model.CommandArgs,
 		return nil, nil, nil
 	}
 
-	rctx.Logger().Debug("Executing command", mlog.String("command", trigger), mlog.String("user_id", args.UserId))
+	rctx = rctx.WithLogFields(mlog.String("command_id", cmd.Id))
 
 	p := url.Values{}
 	p.Set("token", cmd.Token)

server/channels/app/compliance.go

@@ -34,7 +34,7 @@ func (a *App) SaveComplianceReport(rctx request.CTX, job *model.Compliance) (*mo
 
 	job.Type = model.ComplianceTypeAdhoc
 
-	rctx = rctx.WithLogger(rctx.Logger().With(job.LoggerFields()...))
+	rctx = rctx.WithLogFields(job.LoggerFields()...)
 
 	job, err := a.Srv().Store().Compliance().Save(job)
 	if err != nil {

server/channels/app/file.go

@@ -788,11 +788,11 @@ func (a *App) UploadFileX(rctx request.CTX, channelID, name string, input io.Rea
 		o(t)
 	}
 
-	rctx = rctx.WithLogger(rctx.Logger().With(
+	rctx = rctx.WithLogFields(
 		mlog.String("file_name", name),
 		mlog.String("channel_id", channelID),
 		mlog.String("user_id", t.UserId),
-	))
+	)
 
 	if *a.Config().FileSettings.DriverName == "" {
 		return nil, t.newAppError("api.file.upload_file.storage.app_error", http.StatusNotImplemented)

server/channels/app/plugin_commands.go

@@ -137,6 +137,8 @@ func (a *App) tryExecutePluginCommand(rctx request.CTX, args *model.CommandArgs)
 		return nil, nil, nil
 	}
 
+	rctx = rctx.WithLogFields(mlog.String("plugin_id", matched.PluginId))
+
 	pluginsEnvironment := a.GetPluginsEnvironment()
 	if pluginsEnvironment == nil {
 		return nil, nil, nil

server/channels/app/plugin_requests.go

@@ -247,9 +247,7 @@ func (ch *Channels) servePluginRequest(w http.ResponseWriter, r *http.Request, h
 	r.Header.Del(model.HeaderAuth)
 
 	rctx = rctx.
-		WithLogger(rctx.Logger().With(
-			mlog.String("user_id", session.UserId),
-		)).
+		WithLogFields(mlog.String("user_id", session.UserId)).
 		WithSession(session)
 
 	// If MFA is required and user has not activated it, treat it as unauthenticated

server/channels/app/post.go

@@ -2522,7 +2522,7 @@ func (a *App) SetPostReminder(rctx request.CTX, postID, userID string, targetTim
 }
 
 func (a *App) CheckPostReminders(rctx request.CTX) {
-	rctx = rctx.WithLogger(rctx.Logger().With(mlog.String("component", "post_reminders")))
+	rctx = rctx.WithLogFields(mlog.String("component", "post_reminders"))
 	systemBot, appErr := a.GetSystemBot(rctx)
 	if appErr != nil {
 		rctx.Logger().Error("Failed to get system bot", mlog.Err(appErr))

server/channels/app/scheduled_post_job.go

@@ -23,7 +23,7 @@ const (
 )
 
 func (a *App) ProcessScheduledPosts(rctx request.CTX) {
-	rctx = rctx.WithLogger(rctx.Logger().With(mlog.String("component", "scheduled_post_job")))
+	rctx = rctx.WithLogFields(mlog.String("component", "scheduled_post_job"))
 
 	if !*a.Config().ServiceSettings.ScheduledPosts {
 		return

server/public/shared/request/context.go

@@ -168,6 +168,11 @@ func (c *Context) WithLogger(logger mlog.LoggerIFace) CTX {
 	return rctx
 }
 
+// WithLogFields returns a new context with the given fields added to the logger.
+func (c *Context) WithLogFields(fields ...mlog.Field) CTX {
+	return c.WithLogger(c.logger.With(fields...))
+}
+
 func (c *Context) With(f func(ctx CTX) CTX) CTX {
 	return f(c)
 }
@@ -194,6 +199,7 @@ type CTX interface {
 	WithUserAgent(string) CTX
 	WithAcceptLanguage(string) CTX
 	WithLogger(mlog.LoggerIFace) CTX
+	WithLogFields(fields ...mlog.Field) CTX
 	WithContext(ctx context.Context) CTX
 	With(func(ctx CTX) CTX) CTX
 }