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

server/channels/web/handlers.go

@@ -170,14 +170,17 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	t, _ := i18n.GetTranslationsAndLocaleFromRequest(r)
-	c.AppContext.SetT(t)
-	c.AppContext.SetRequestId(requestID)
-	c.AppContext.SetIPAddress(utils.GetIPAddress(r, c.App.Config().ServiceSettings.TrustedProxyIPHeader))
-	c.AppContext.SetXForwardedFor(r.Header.Get("X-Forwarded-For"))
-	c.AppContext.SetUserAgent(r.UserAgent())
-	c.AppContext.SetAcceptLanguage(r.Header.Get("Accept-Language"))
-	c.AppContext.SetPath(r.URL.Path)
-	c.AppContext.SetContext(context.Background())
+	c.AppContext = request.NewContext(
+		context.Background(),
+		requestID,
+		utils.GetIPAddress(r, c.App.Config().ServiceSettings.TrustedProxyIPHeader),
+		r.Header.Get("X-Forwarded-For"),
+		r.URL.Path,
+		r.UserAgent(),
+		r.Header.Get("Accept-Language"),
+		t,
+	)
+
 	c.Params = ParamsFromRequest(r)
 	c.Logger = c.App.Log()
 

server/channels/web/handlers_test.go

@@ -558,7 +558,7 @@ func TestGenerateDevCSP(t *testing.T) {
 			*cfg.ServiceSettings.DeveloperFlags = ""
 		})
 
-		logger := mlog.CreateConsoleTestLogger(false, mlog.LvlWarn)
+		logger := mlog.CreateConsoleTestLogger(t)
 		buf := &mlog.Buffer{}
 		require.NoError(t, mlog.AddWriterTarget(logger, buf, false, mlog.LvlWarn))
 
@@ -570,8 +570,6 @@ func TestGenerateDevCSP(t *testing.T) {
 
 		generateDevCSP(*c)
 
-		require.NoError(t, logger.Shutdown())
-
 		assert.Equal(t, "", buf.String())
 	})
 }

server/channels/web/oauth_test.go

@@ -608,8 +608,7 @@ func TestOAuthComplete_ErrorMessages(t *testing.T) {
 
 	translationFunc := i18n.GetUserTranslations("en")
 	c.AppContext.SetT(translationFunc)
-	c.Logger = mlog.CreateConsoleTestLogger(true, mlog.LvlDebug)
-	defer c.Logger.Shutdown()
+	c.Logger = mlog.CreateConsoleTestLogger(t)
 	th.App.UpdateConfig(func(cfg *model.Config) { *cfg.GitLabSettings.Enable = true })
 	th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableOAuthServiceProvider = true })
 	provider := &MattermostTestProvider{}