[MM-55595] Use annotated logger in search layer (#25468)

server/channels/store/localcachelayer/channel_layer.go

@@ -7,6 +7,7 @@ import (
 	"bytes"
 
 	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/request"
 	"github.com/mattermost/mattermost/server/v8/channels/store"
 )
 
@@ -253,8 +254,8 @@ func (s LocalCacheChannelStore) GetChannelsMemberCount(channelIDs []string) (_ m
 	return counts, nil
 }
 
-func (s LocalCacheChannelStore) UpdateMember(member *model.ChannelMember) (*model.ChannelMember, error) {
-	member, err := s.ChannelStore.UpdateMember(member)
+func (s LocalCacheChannelStore) UpdateMember(rctx request.CTX, member *model.ChannelMember) (*model.ChannelMember, error) {
+	member, err := s.ChannelStore.UpdateMember(rctx, member)
 	if err != nil {
 		return nil, err
 	}
@@ -273,8 +274,8 @@ func (s LocalCacheChannelStore) UpdateMultipleMembers(members []*model.ChannelMe
 	return members, nil
 }
 
-func (s LocalCacheChannelStore) RemoveMember(channelId, userId string) error {
-	err := s.ChannelStore.RemoveMember(channelId, userId)
+func (s LocalCacheChannelStore) RemoveMember(rctx request.CTX, channelId, userId string) error {
+	err := s.ChannelStore.RemoveMember(rctx, channelId, userId)
 	if err != nil {
 		return err
 	}
@@ -282,8 +283,8 @@ func (s LocalCacheChannelStore) RemoveMember(channelId, userId string) error {
 	return nil
 }
 
-func (s LocalCacheChannelStore) RemoveMembers(channelId string, userIds []string) error {
-	err := s.ChannelStore.RemoveMembers(channelId, userIds)
+func (s LocalCacheChannelStore) RemoveMembers(rctx request.CTX, channelId string, userIds []string) error {
+	err := s.ChannelStore.RemoveMembers(rctx, channelId, userIds)
 	if err != nil {
 		return err
 	}

server/channels/store/localcachelayer/layer_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	"github.com/mattermost/mattermost/server/public/model"
+	"github.com/mattermost/mattermost/server/public/shared/mlog"
 	"github.com/mattermost/mattermost/server/public/shared/request"
 	"github.com/mattermost/mattermost/server/v8/channels/store"
 	"github.com/mattermost/mattermost/server/v8/channels/store/sqlstore"
@@ -72,7 +73,7 @@ func StoreTestWithSqlStore(t *testing.T, f func(*testing.T, request.CTX, store.S
 	}
 }
 
-func initStores() {
+func initStores(logger mlog.LoggerIFace) {
 	if testing.Short() {
 		return
 	}
@@ -103,7 +104,7 @@ func initStores() {
 		eg.Go(func() error {
 			var err error
 
-			st.SqlStore, err = sqlstore.New(*st.SqlSettings, nil)
+			st.SqlStore, err = sqlstore.New(*st.SqlSettings, logger, nil)
 			if err != nil {
 				return err
 			}

server/channels/store/localcachelayer/main_test.go

@@ -184,7 +184,7 @@ func TestMain(m *testing.M) {
 	mainHelper = testlib.NewMainHelperWithOptions(nil)
 	defer mainHelper.Close()
 
-	initStores()
+	initStores(mainHelper.Logger)
 	mainHelper.Main(m)
 	tearDownStores()
 }