[MM-55480] Update logr to v2.0.21 (#25431)

server/channels/app/platform/cluster_handlers.go

@@ -112,7 +112,7 @@ func (ps *PlatformService) clusterBusyStateChgHandler(msg *model.ClusterMessage)
 
 	ps.Busy.ClusterEventChanged(&sbs)
 	if sbs.Busy {
-		ps.logger.Warn("server busy state activated via cluster event - non-critical services disabled", mlog.Int64("expires_sec", sbs.Expires))
+		ps.logger.Warn("server busy state activated via cluster event - non-critical services disabled", mlog.Int("expires_sec", sbs.Expires))
 	} else {
 		ps.logger.Info("server busy state cleared via cluster event - non-critical services enabled")
 	}

server/channels/app/platform/config.go

@@ -147,7 +147,7 @@ func (ps *PlatformService) ConfigureLogger(name string, logger *mlog.Logger, log
 		if err != nil {
 			return fmt.Errorf("invalid config source for %s, %w", name, err)
 		}
-		ps.logger.Info("Loaded configuration for "+name, mlog.String("source", string(dsn)))
+		ps.logger.Info("Loaded configuration for "+name, mlog.String("source", dsn))
 	} else {
 		ps.logger.Debug("Advanced logging config not provided for " + name)
 	}

server/channels/app/platform/feature_flags.go

@@ -42,7 +42,7 @@ func (ps *PlatformService) updateFeatureFlagValuesFromManagement() {
 	newFlags := ps.featureFlagSynchronizer.UpdateFeatureFlagValues(oldFlags)
 	oldFlagsBytes, _ := json.Marshal(oldFlags)
 	newFlagsBytes, _ := json.Marshal(newFlags)
-	ps.logger.Debug("Checking feature flags from management service", mlog.String("old_flags", string(oldFlagsBytes)), mlog.String("new_flags", string(newFlagsBytes)))
+	ps.logger.Debug("Checking feature flags from management service", mlog.String("old_flags", oldFlagsBytes), mlog.String("new_flags", newFlagsBytes))
 	if oldFlags != newFlags {
 		ps.logger.Debug("Feature flag change detected, updating config")
 		*newCfg.FeatureFlags = newFlags

server/channels/app/platform/log.go

@@ -13,7 +13,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/mattermost/logr/v2"
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/shared/mlog"
 	"github.com/mattermost/mattermost/server/v8/config"
@@ -32,7 +31,10 @@ func (ps *PlatformService) initLogging() error {
 	// create the app logger if needed
 	if ps.logger == nil {
 		var err error
-		ps.logger, err = mlog.NewLogger(logr.MaxFieldLen(*ps.Config().LogSettings.MaxFieldSize))
+		ps.logger, err = mlog.NewLogger(
+			mlog.MaxFieldLen(*ps.Config().LogSettings.MaxFieldSize),
+			mlog.StackFilter("log"),
+		)
 		if err != nil {
 			return err
 		}

server/channels/app/platform/shared_channel_notifier.go

@@ -40,7 +40,7 @@ func (ps *PlatformService) SharedChannelSyncHandler(event *model.WebSocketEvent)
 		if err != nil {
 			mlog.Warn(
 				err.Error(),
-				mlog.String("event", string(event.EventType())),
+				mlog.String("event", event.EventType()),
 				mlog.String("action", "content_sync"),
 			)
 		}
@@ -49,7 +49,7 @@ func (ps *PlatformService) SharedChannelSyncHandler(event *model.WebSocketEvent)
 		if err != nil {
 			mlog.Warn(
 				err.Error(),
-				mlog.String("event", string(event.EventType())),
+				mlog.String("event", event.EventType()),
 				mlog.String("action", "invitation"),
 			)
 		}

server/channels/app/platform/web_conn.go

@@ -477,7 +477,7 @@ func (wc *WebConn) writePump() {
 				logData := []mlog.Field{
 					mlog.String("user_id", wc.UserId),
 					mlog.String("conn_id", wc.GetConnectionID()),
-					mlog.String("type", string(msg.EventType())),
+					mlog.String("type", msg.EventType()),
 					mlog.Int("size", buf.Len()),
 				}
 				if evtOk {
@@ -735,7 +735,7 @@ func (wc *WebConn) ShouldSendEvent(msg *model.WebSocketEvent) bool {
 					"websocket.slow: dropping message",
 					mlog.String("user_id", wc.UserId),
 					mlog.String("conn_id", wc.GetConnectionID()),
-					mlog.String("type", string(msg.EventType())),
+					mlog.String("type", msg.EventType()),
 				)
 				// Reset timer to now.
 				wc.lastLogTimeSlow = time.Now()

server/channels/app/platform/websocket_router.go

@@ -96,7 +96,7 @@ func returnWebSocketError(ps *PlatformService, conn *WebConn, r *model.WebSocket
 	}
 	logF(
 		"websocket routing error.",
-		mlog.Int64("seq", r.Seq),
+		mlog.Int("seq", r.Seq),
 		mlog.String("user_id", conn.UserId),
 		mlog.String("system_message", err.SystemMessage(i18n.T)),
 		mlog.Err(err),