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

server/channels/app/email/email_batching_test.go

@@ -93,7 +93,7 @@ func TestCheckPendingNotifications(t *testing.T) {
 	channelMember, err := th.store.Channel().GetMember(context.Background(), th.BasicChannel.Id, th.BasicUser.Id)
 	require.NoError(t, err)
 	channelMember.LastViewedAt = 9999999
-	_, err = th.store.Channel().UpdateMember(channelMember)
+	_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
 	require.NoError(t, err)
 
 	nErr := th.store.Preference().Save(model.Preferences{{
@@ -114,7 +114,7 @@ func TestCheckPendingNotifications(t *testing.T) {
 	channelMember, err = th.store.Channel().GetMember(context.Background(), th.BasicChannel.Id, th.BasicUser.Id)
 	require.NoError(t, err)
 	channelMember.LastViewedAt = 10001000
-	_, err = th.store.Channel().UpdateMember(channelMember)
+	_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
 	require.NoError(t, err)
 
 	// We reset the interval to something shorter
@@ -208,7 +208,7 @@ func TestCheckPendingNotificationsDefaultInterval(t *testing.T) {
 	channelMember, err := th.store.Channel().GetMember(context.Background(), th.BasicChannel.Id, th.BasicUser.Id)
 	require.NoError(t, err)
 	channelMember.LastViewedAt = 9999000
-	_, err = th.store.Channel().UpdateMember(channelMember)
+	_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
 	require.NoError(t, err)
 
 	job.pendingNotifications[th.BasicUser.Id] = []*batchedNotification{
@@ -250,7 +250,7 @@ func TestCheckPendingNotificationsCantParseInterval(t *testing.T) {
 	channelMember, err := th.store.Channel().GetMember(context.Background(), th.BasicChannel.Id, th.BasicUser.Id)
 	require.NoError(t, err)
 	channelMember.LastViewedAt = 9999000
-	_, err = th.store.Channel().UpdateMember(channelMember)
+	_, err = th.store.Channel().UpdateMember(th.Context, channelMember)
 	require.NoError(t, err)
 
 	// preference value is not an integer, so we'll fall back to the default 15min value

server/channels/app/email/helper_test.go

@@ -4,7 +4,6 @@
 package email
 
 import (
-	"bytes"
 	"os"
 	"path/filepath"
 	"testing"
@@ -12,6 +11,7 @@ import (
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/public/plugin/plugintest/mock"
 	"github.com/mattermost/mattermost/server/public/shared/mlog"
+	"github.com/mattermost/mattermost/server/public/shared/request"
 	"github.com/mattermost/mattermost/server/v8/channels/app/users"
 	"github.com/mattermost/mattermost/server/v8/channels/store"
 	"github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
@@ -32,7 +32,8 @@ type TestHelper struct {
 	BasicUser2   *model.User
 
 	SystemAdminUser *model.User
-	LogBuffer       *bytes.Buffer
+
+	Context request.CTX
 }
 
 func Setup(tb testing.TB) *TestHelper {
@@ -132,8 +133,8 @@ func setupTestHelper(s store.Store, tb testing.TB) *TestHelper {
 		service:     service,
 		configStore: configStore,
 		store:       s,
-		LogBuffer:   &bytes.Buffer{},
 		workspace:   tempWorkspace,
+		Context:     request.TestContext(tb),
 	}
 }