fix: reduce load on view tables (#4716)

* fix: reduce load on view tables * create prerelease * linting: pass context to view handlers * fix error handling of refresh token handler * fix: improve processing of successful instanceIDs on views * fix revert intended change in .golangci.yaml * fix: set timeout for processInstances in spooler * fix: reduce update to active tokens on profile change * change token expiration query to db now() * remove branch from .releaserc.js
2025-08-12 04:57:33 +00:00 · 2022-11-22 07:36:48 +01:00
parent 29441ce4b6
commit e8babf1048
37 changed files with 295 additions and 238 deletions
--- a/internal/auth/repository/eventsourcing/handler/handler.go
+++ b/internal/auth/repository/eventsourcing/handler/handler.go
@@ -33,24 +33,24 @@ func (h *handler) Eventstore() v1.Eventstore {
 	return h.es
 }

-func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, es v1.Eventstore, systemDefaults sd.SystemDefaults, queries *query2.Queries) []query.Handler {
+func Register(ctx context.Context, configs Configs, bulkLimit, errorCount uint64, view *view.View, es v1.Eventstore, systemDefaults sd.SystemDefaults, queries *query2.Queries) []query.Handler {
 	return []query.Handler{
-		newUser(
+		newUser(ctx,
 			handler{view, bulkLimit, configs.cycleDuration("User"), errorCount, es}, queries),
-		newUserSession(
+		newUserSession(ctx,
 			handler{view, bulkLimit, configs.cycleDuration("UserSession"), errorCount, es}, queries),
-		newToken(
+		newToken(ctx,
 			handler{view, bulkLimit, configs.cycleDuration("Token"), errorCount, es}),
-		newIDPConfig(
+		newIDPConfig(ctx,
 			handler{view, bulkLimit, configs.cycleDuration("IDPConfig"), errorCount, es}),
-		newIDPProvider(
+		newIDPProvider(ctx,
 			handler{view, bulkLimit, configs.cycleDuration("IDPProvider"), errorCount, es},
 			systemDefaults, queries),
-		newExternalIDP(
+		newExternalIDP(ctx,
 			handler{view, bulkLimit, configs.cycleDuration("ExternalIDP"), errorCount, es},
 			systemDefaults, queries),
-		newRefreshToken(handler{view, bulkLimit, configs.cycleDuration("RefreshToken"), errorCount, es}),
-		newOrgProjectMapping(handler{view, bulkLimit, configs.cycleDuration("OrgProjectMapping"), errorCount, es}),
+		newRefreshToken(ctx, handler{view, bulkLimit, configs.cycleDuration("RefreshToken"), errorCount, es}),
+		newOrgProjectMapping(ctx, handler{view, bulkLimit, configs.cycleDuration("OrgProjectMapping"), errorCount, es}),
 	}
 }

@@ -80,9 +80,9 @@ func withInstanceID(ctx context.Context, instanceID string) context.Context {

 func newSearchQuery(sequences []*repository.CurrentSequence, aggregateTypes []models.AggregateType, instanceIDs []string) *models.SearchQuery {
 	searchQuery := models.NewSearchQuery()
-	for _, sequence := range sequences {
+	for _, instanceID := range instanceIDs {
 		var seq uint64
-		for _, instanceID := range instanceIDs {
+		for _, sequence := range sequences {
 			if sequence.InstanceID == instanceID {
 				seq = sequence.CurrentSequence
 				break
@@ -91,7 +91,7 @@ func newSearchQuery(sequences []*repository.CurrentSequence, aggregateTypes []mo
 		searchQuery.AddQuery().
 			AggregateTypeFilter(aggregateTypes...).
 			LatestSequenceFilter(seq).
-			InstanceIDFilter(sequence.InstanceID)
+			InstanceIDFilter(instanceID)
 	}
 	return searchQuery
 }
--- a/internal/auth/repository/eventsourcing/handler/idp_config.go
+++ b/internal/auth/repository/eventsourcing/handler/idp_config.go
@@ -1,6 +1,8 @@
 package handler

 import (
+	"context"
+
 	"github.com/zitadel/logging"

 	"github.com/zitadel/zitadel/internal/eventstore"
@@ -23,21 +25,21 @@ type IDPConfig struct {
 	subscription *v1.Subscription
 }

-func newIDPConfig(h handler) *IDPConfig {
+func newIDPConfig(ctx context.Context, h handler) *IDPConfig {
 	idpConfig := &IDPConfig{
 		handler: h,
 	}

-	idpConfig.subscribe()
+	idpConfig.subscribe(ctx)

 	return idpConfig
 }

-func (i *IDPConfig) subscribe() {
+func (i *IDPConfig) subscribe(ctx context.Context) {
 	i.subscription = i.es.Subscribe(i.AggregateTypes()...)
 	go func() {
 		for event := range i.subscription.Events {
-			query.ReduceEvent(i, event)
+			query.ReduceEvent(ctx, i, event)
 		}
 	}()
 }
@@ -62,8 +64,8 @@ func (i *IDPConfig) CurrentSequence(instanceID string) (uint64, error) {
 	return sequence.CurrentSequence, nil
 }

-func (i *IDPConfig) EventQuery(instanceIDs ...string) (*models.SearchQuery, error) {
-	sequences, err := i.view.GetLatestIDPConfigSequences(instanceIDs...)
+func (i *IDPConfig) EventQuery(instanceIDs []string) (*models.SearchQuery, error) {
+	sequences, err := i.view.GetLatestIDPConfigSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -129,10 +131,10 @@ func (i *IDPConfig) processIdpConfig(providerType iam_model.IDPProviderType, eve
 }

 func (i *IDPConfig) OnError(event *models.Event, err error) error {
-	logging.LogWithFields("SPOOL-Ejf8s", "id", event.AggregateID).WithError(err).Warn("something went wrong in idp config handler")
+	logging.WithFields("id", event.AggregateID).WithError(err).Warn("something went wrong in idp config handler")
 	return spooler.HandleError(event, err, i.view.GetLatestIDPConfigFailedEvent, i.view.ProcessedIDPConfigFailedEvent, i.view.ProcessedIDPConfigSequence, i.errorCountUntilSkip)
 }

-func (i *IDPConfig) OnSuccess() error {
-	return spooler.HandleSuccess(i.view.UpdateIDPConfigSpoolerRunTimestamp)
+func (i *IDPConfig) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(i.view.UpdateIDPConfigSpoolerRunTimestamp, instanceIDs)
 }
--- a/internal/auth/repository/eventsourcing/handler/idp_providers.go
+++ b/internal/auth/repository/eventsourcing/handler/idp_providers.go
@@ -32,6 +32,7 @@ type IDPProvider struct {
 }

 func newIDPProvider(
+	ctx context.Context,
 	h handler,
 	defaults systemdefaults.SystemDefaults,
 	queries *query2.Queries,
@@ -42,16 +43,16 @@ func newIDPProvider(
 		queries:        queries,
 	}

-	idpProvider.subscribe()
+	idpProvider.subscribe(ctx)

 	return idpProvider
 }

-func (i *IDPProvider) subscribe() {
+func (i *IDPProvider) subscribe(ctx context.Context) {
 	i.subscription = i.es.Subscribe(i.AggregateTypes()...)
 	go func() {
 		for event := range i.subscription.Events {
-			query.ReduceEvent(i, event)
+			query.ReduceEvent(ctx, i, event)
 		}
 	}()
 }
@@ -76,8 +77,8 @@ func (i *IDPProvider) CurrentSequence(instanceID string) (uint64, error) {
 	return sequence.CurrentSequence, nil
 }

-func (i *IDPProvider) EventQuery(instanceIDs ...string) (*models.SearchQuery, error) {
-	sequences, err := i.view.GetLatestIDPProviderSequences(instanceIDs...)
+func (i *IDPProvider) EventQuery(instanceIDs []string) (*es_models.SearchQuery, error) {
+	sequences, err := i.view.GetLatestIDPProviderSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -188,14 +189,14 @@ func (i *IDPProvider) OnError(event *es_models.Event, err error) error {
 	return spooler.HandleError(event, err, i.view.GetLatestIDPProviderFailedEvent, i.view.ProcessedIDPProviderFailedEvent, i.view.ProcessedIDPProviderSequence, i.errorCountUntilSkip)
 }

-func (i *IDPProvider) OnSuccess() error {
-	return spooler.HandleSuccess(i.view.UpdateIDPProviderSpoolerRunTimestamp)
+func (i *IDPProvider) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(i.view.UpdateIDPProviderSpoolerRunTimestamp, instanceIDs)
 }

 func (i *IDPProvider) getOrgIDPConfig(instanceID, aggregateID, idpConfigID string) (*query2.IDP, error) {
 	return i.queries.IDPByIDAndResourceOwner(withInstanceID(context.Background(), instanceID), false, idpConfigID, aggregateID)
 }

-func (u *IDPProvider) getDefaultIDPConfig(instanceID, idpConfigID string) (*query2.IDP, error) {
-	return u.queries.IDPByIDAndResourceOwner(withInstanceID(context.Background(), instanceID), false, idpConfigID, instanceID)
+func (i *IDPProvider) getDefaultIDPConfig(instanceID, idpConfigID string) (*query2.IDP, error) {
+	return i.queries.IDPByIDAndResourceOwner(withInstanceID(context.Background(), instanceID), false, idpConfigID, instanceID)
 }
--- a/internal/auth/repository/eventsourcing/handler/org_project_mapping.go
+++ b/internal/auth/repository/eventsourcing/handler/org_project_mapping.go
@@ -1,6 +1,8 @@
 package handler

 import (
+	"context"
+
 	"github.com/zitadel/logging"

 	"github.com/zitadel/zitadel/internal/eventstore"
@@ -23,22 +25,23 @@ type OrgProjectMapping struct {
 }

 func newOrgProjectMapping(
+	ctx context.Context,
 	handler handler,
 ) *OrgProjectMapping {
 	h := &OrgProjectMapping{
 		handler: handler,
 	}

-	h.subscribe()
+	h.subscribe(ctx)

 	return h
 }

-func (k *OrgProjectMapping) subscribe() {
-	k.subscription = k.es.Subscribe(k.AggregateTypes()...)
+func (p *OrgProjectMapping) subscribe(ctx context.Context) {
+	p.subscription = p.es.Subscribe(p.AggregateTypes()...)
 	go func() {
-		for event := range k.subscription.Events {
-			query.ReduceEvent(k, event)
+		for event := range p.subscription.Events {
+			query.ReduceEvent(ctx, p, event)
 		}
 	}()
 }
@@ -63,8 +66,8 @@ func (p *OrgProjectMapping) CurrentSequence(instanceID string) (uint64, error) {
 	return sequence.CurrentSequence, nil
 }

-func (p *OrgProjectMapping) EventQuery(instanceIDs ...string) (*es_models.SearchQuery, error) {
-	sequences, err := p.view.GetLatestOrgProjectMappingSequences(instanceIDs...)
+func (p *OrgProjectMapping) EventQuery(instanceIDs []string) (*es_models.SearchQuery, error) {
+	sequences, err := p.view.GetLatestOrgProjectMappingSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -85,15 +88,21 @@ func (p *OrgProjectMapping) Reduce(event *es_models.Event) (err error) {
 		}
 	case project.GrantAddedType:
 		projectGrant := new(view_model.ProjectGrant)
-		projectGrant.SetData(event)
+		err := projectGrant.SetData(event)
+		if err != nil {
+			return err
+		}
 		mapping.OrgID = projectGrant.GrantedOrgID
 		mapping.ProjectID = event.AggregateID
 		mapping.ProjectGrantID = projectGrant.GrantID
 		mapping.InstanceID = event.InstanceID
 	case project.GrantRemovedType:
 		projectGrant := new(view_model.ProjectGrant)
-		projectGrant.SetData(event)
-		err := p.view.DeleteOrgProjectMappingsByProjectGrantID(event.AggregateID, event.InstanceID)
+		err := projectGrant.SetData(event)
+		if err != nil {
+			return err
+		}
+		err = p.view.DeleteOrgProjectMappingsByProjectGrantID(event.AggregateID, event.InstanceID)
 		if err == nil {
 			return p.view.ProcessedOrgProjectMappingSequence(event)
 		}
@@ -109,10 +118,10 @@ func (p *OrgProjectMapping) Reduce(event *es_models.Event) (err error) {
 }

 func (p *OrgProjectMapping) OnError(event *es_models.Event, err error) error {
-	logging.LogWithFields("SPOOL-2k0fS", "id", event.AggregateID).WithError(err).Warn("something went wrong in org project mapping handler")
+	logging.WithFields("id", event.AggregateID).WithError(err).Warn("something went wrong in org project mapping handler")
 	return spooler.HandleError(event, err, p.view.GetLatestOrgProjectMappingFailedEvent, p.view.ProcessedOrgProjectMappingFailedEvent, p.view.ProcessedOrgProjectMappingSequence, p.errorCountUntilSkip)
 }

-func (p *OrgProjectMapping) OnSuccess() error {
-	return spooler.HandleSuccess(p.view.UpdateOrgProjectMappingSpoolerRunTimestamp)
+func (p *OrgProjectMapping) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(p.view.UpdateOrgProjectMappingSpoolerRunTimestamp, instanceIDs)
 }
--- a/internal/auth/repository/eventsourcing/handler/refresh_token.go
+++ b/internal/auth/repository/eventsourcing/handler/refresh_token.go
@@ -1,6 +1,7 @@
 package handler

 import (
+	"context"
 	"encoding/json"

 	"github.com/zitadel/logging"
@@ -27,22 +28,23 @@ type RefreshToken struct {
 }

 func newRefreshToken(
+	ctx context.Context,
 	handler handler,
 ) *RefreshToken {
 	h := &RefreshToken{
 		handler: handler,
 	}

-	h.subscribe()
+	h.subscribe(ctx)

 	return h
 }

-func (t *RefreshToken) subscribe() {
+func (t *RefreshToken) subscribe(ctx context.Context) {
 	t.subscription = t.es.Subscribe(t.AggregateTypes()...)
 	go func() {
 		for event := range t.subscription.Events {
-			query.ReduceEvent(t, event)
+			query.ReduceEvent(ctx, t, event)
 		}
 	}()
 }
@@ -67,8 +69,8 @@ func (t *RefreshToken) CurrentSequence(instanceID string) (uint64, error) {
 	return sequence.CurrentSequence, nil
 }

-func (t *RefreshToken) EventQuery(instanceIDs ...string) (*es_models.SearchQuery, error) {
-	sequences, err := t.view.GetLatestRefreshTokenSequences(instanceIDs...)
+func (t *RefreshToken) EventQuery(instanceIDs []string) (*es_models.SearchQuery, error) {
+	sequences, err := t.view.GetLatestRefreshTokenSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -87,7 +89,7 @@ func (t *RefreshToken) Reduce(event *es_models.Event) (err error) {
 	case user.HumanRefreshTokenRenewedType:
 		e := new(user.HumanRefreshTokenRenewedEvent)
 		if err := json.Unmarshal(event.Data, e); err != nil {
-			logging.Log("EVEN-DBbn4").WithError(err).Error("could not unmarshal event data")
+			logging.WithError(err).Error("could not unmarshal event data")
 			return caos_errs.ThrowInternal(nil, "MODEL-BHn75", "could not unmarshal data")
 		}
 		token, err := t.view.RefreshTokenByID(e.TokenID, event.InstanceID)
@@ -102,7 +104,7 @@ func (t *RefreshToken) Reduce(event *es_models.Event) (err error) {
 	case user.HumanRefreshTokenRemovedType:
 		e := new(user.HumanRefreshTokenRemovedEvent)
 		if err := json.Unmarshal(event.Data, e); err != nil {
-			logging.Log("EVEN-BDbh3").WithError(err).Error("could not unmarshal event data")
+			logging.WithError(err).Error("could not unmarshal event data")
 			return caos_errs.ThrowInternal(nil, "MODEL-Bz653", "could not unmarshal data")
 		}
 		return t.view.DeleteRefreshToken(e.TokenID, event.InstanceID, event)
@@ -118,10 +120,10 @@ func (t *RefreshToken) Reduce(event *es_models.Event) (err error) {
 }

 func (t *RefreshToken) OnError(event *es_models.Event, err error) error {
-	logging.LogWithFields("SPOOL-3jkl4", "id", event.AggregateID).WithError(err).Warn("something went wrong in token handler")
-	return spooler.HandleError(event, err, t.view.GetLatestTokenFailedEvent, t.view.ProcessedTokenFailedEvent, t.view.ProcessedTokenSequence, t.errorCountUntilSkip)
+	logging.WithFields("id", event.AggregateID).WithError(err).Warn("something went wrong in token handler")
+	return spooler.HandleError(event, err, t.view.GetLatestRefreshTokenFailedEvent, t.view.ProcessedRefreshTokenFailedEvent, t.view.ProcessedRefreshTokenSequence, t.errorCountUntilSkip)
 }

-func (t *RefreshToken) OnSuccess() error {
-	return spooler.HandleSuccess(t.view.UpdateTokenSpoolerRunTimestamp)
+func (t *RefreshToken) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(t.view.UpdateRefreshTokenSpoolerRunTimestamp, instanceIDs)
 }
--- a/internal/auth/repository/eventsourcing/handler/token.go
+++ b/internal/auth/repository/eventsourcing/handler/token.go
@@ -33,22 +33,23 @@ type Token struct {
 }

 func newToken(
+	ctx context.Context,
 	handler handler,
 ) *Token {
 	h := &Token{
 		handler: handler,
 	}

-	h.subscribe()
+	h.subscribe(ctx)

 	return h
 }

-func (t *Token) subscribe() {
+func (t *Token) subscribe(ctx context.Context) {
 	t.subscription = t.es.Subscribe(t.AggregateTypes()...)
 	go func() {
 		for event := range t.subscription.Events {
-			query.ReduceEvent(t, event)
+			query.ReduceEvent(ctx, t, event)
 		}
 	}()
 }
@@ -65,16 +66,16 @@ func (_ *Token) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{user.AggregateType, project.AggregateType, instance.AggregateType}
 }

-func (p *Token) CurrentSequence(instanceID string) (uint64, error) {
-	sequence, err := p.view.GetLatestTokenSequence(instanceID)
+func (t *Token) CurrentSequence(instanceID string) (uint64, error) {
+	sequence, err := t.view.GetLatestTokenSequence(instanceID)
 	if err != nil {
 		return 0, err
 	}
 	return sequence.CurrentSequence, nil
 }

-func (t *Token) EventQuery(instanceIDs ...string) (*es_models.SearchQuery, error) {
-	sequences, err := t.view.GetLatestTokenSequences(instanceIDs...)
+func (t *Token) EventQuery(instanceIDs []string) (*es_models.SearchQuery, error) {
+	sequences, err := t.view.GetLatestTokenSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -94,7 +95,10 @@ func (t *Token) Reduce(event *es_models.Event) (err error) {
 	case user.UserV1ProfileChangedType,
 		user.HumanProfileChangedType:
 		user := new(view_model.UserView)
-		user.AppendEvent(event)
+		err := user.AppendEvent(event)
+		if err != nil {
+			return err
+		}
 		tokens, err := t.view.TokensByUserID(event.AggregateID, event.InstanceID)
 		if err != nil {
 			return err
@@ -153,14 +157,14 @@ func (t *Token) Reduce(event *es_models.Event) (err error) {
 }

 func (t *Token) OnError(event *es_models.Event, err error) error {
-	logging.LogWithFields("SPOOL-3jkl4", "id", event.AggregateID).WithError(err).Warn("something went wrong in token handler")
+	logging.WithFields("id", event.AggregateID).WithError(err).Warn("something went wrong in token handler")
 	return spooler.HandleError(event, err, t.view.GetLatestTokenFailedEvent, t.view.ProcessedTokenFailedEvent, t.view.ProcessedTokenSequence, t.errorCountUntilSkip)
 }

 func agentIDFromSession(event *es_models.Event) (string, error) {
 	session := make(map[string]interface{})
 	if err := json.Unmarshal(event.Data, &session); err != nil {
-		logging.Log("EVEN-s3bq9").WithError(err).Error("could not unmarshal event data")
+		logging.WithError(err).Error("could not unmarshal event data")
 		return "", caos_errs.ThrowInternal(nil, "MODEL-sd325", "could not unmarshal data")
 	}
 	return session["userAgentID"].(string), nil
@@ -169,7 +173,7 @@ func agentIDFromSession(event *es_models.Event) (string, error) {
 func applicationFromSession(event *es_models.Event) (*project_es_model.Application, error) {
 	application := new(project_es_model.Application)
 	if err := json.Unmarshal(event.Data, &application); err != nil {
-		logging.Log("EVEN-GRE2q").WithError(err).Error("could not unmarshal event data")
+		logging.WithError(err).Error("could not unmarshal event data")
 		return nil, caos_errs.ThrowInternal(nil, "MODEL-Hrw1q", "could not unmarshal data")
 	}
 	return application, nil
@@ -178,7 +182,7 @@ func applicationFromSession(event *es_models.Event) (*project_es_model.Applicati
 func tokenIDFromRemovedEvent(event *es_models.Event) (string, error) {
 	removed := make(map[string]interface{})
 	if err := json.Unmarshal(event.Data, &removed); err != nil {
-		logging.Log("EVEN-Sdff3").WithError(err).Error("could not unmarshal event data")
+		logging.WithError(err).Error("could not unmarshal event data")
 		return "", caos_errs.ThrowInternal(nil, "MODEL-Sff32", "could not unmarshal data")
 	}
 	return removed["tokenId"].(string), nil
@@ -187,14 +191,14 @@ func tokenIDFromRemovedEvent(event *es_models.Event) (string, error) {
 func refreshTokenIDFromRemovedEvent(event *es_models.Event) (string, error) {
 	removed := make(map[string]interface{})
 	if err := json.Unmarshal(event.Data, &removed); err != nil {
-		logging.Log("EVEN-Ff23g").WithError(err).Error("could not unmarshal event data")
+		logging.WithError(err).Error("could not unmarshal event data")
 		return "", caos_errs.ThrowInternal(nil, "MODEL-Dfb3w", "could not unmarshal data")
 	}
 	return removed["tokenId"].(string), nil
 }

-func (t *Token) OnSuccess() error {
-	return spooler.HandleSuccess(t.view.UpdateTokenSpoolerRunTimestamp)
+func (t *Token) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(t.view.UpdateTokenSpoolerRunTimestamp, instanceIDs)
 }

 func (t *Token) getProjectByID(ctx context.Context, projID, instanceID string) (*proj_model.Project, error) {
--- a/internal/auth/repository/eventsourcing/handler/user.go
+++ b/internal/auth/repository/eventsourcing/handler/user.go
@@ -34,6 +34,7 @@ type User struct {
 }

 func newUser(
+	ctx context.Context,
 	handler handler,
 	queries *query2.Queries,
 ) *User {
@@ -42,16 +43,16 @@ func newUser(
 		queries: queries,
 	}

-	h.subscribe()
+	h.subscribe(ctx)

 	return h
 }

-func (k *User) subscribe() {
-	k.subscription = k.es.Subscribe(k.AggregateTypes()...)
+func (u *User) subscribe(ctx context.Context) {
+	u.subscription = u.es.Subscribe(u.AggregateTypes()...)
 	go func() {
-		for event := range k.subscription.Events {
-			query.ReduceEvent(k, event)
+		for event := range u.subscription.Events {
+			query.ReduceEvent(ctx, u, event)
 		}
 	}()
 }
@@ -75,8 +76,8 @@ func (u *User) CurrentSequence(instanceID string) (uint64, error) {
 	return sequence.CurrentSequence, nil
 }

-func (u *User) EventQuery(instanceIDs ...string) (*es_models.SearchQuery, error) {
-	sequences, err := u.view.GetLatestUserSequences(instanceIDs...)
+func (u *User) EventQuery(instanceIDs []string) (*es_models.SearchQuery, error) {
+	sequences, err := u.view.GetLatestUserSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -275,12 +276,12 @@ func (u *User) fillPreferredLoginNamesOnOrgUsers(event *es_models.Event) error {
 }

 func (u *User) OnError(event *es_models.Event, err error) error {
-	logging.LogWithFields("SPOOL-is8aAWima", "id", event.AggregateID).WithError(err).Warn("something went wrong in user handler")
+	logging.WithFields("id", event.AggregateID).WithError(err).Warn("something went wrong in user handler")
 	return spooler.HandleError(event, err, u.view.GetLatestUserFailedEvent, u.view.ProcessedUserFailedEvent, u.view.ProcessedUserSequence, u.errorCountUntilSkip)
 }

-func (u *User) OnSuccess() error {
-	return spooler.HandleSuccess(u.view.UpdateUserSpoolerRunTimestamp)
+func (u *User) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(u.view.UpdateUserSpoolerRunTimestamp, instanceIDs)
 }

 func (u *User) getOrgByID(ctx context.Context, orgID, instanceID string) (*org_model.Org, error) {
--- a/internal/auth/repository/eventsourcing/handler/user_external_idps.go
+++ b/internal/auth/repository/eventsourcing/handler/user_external_idps.go
@@ -33,6 +33,7 @@ type ExternalIDP struct {
 }

 func newExternalIDP(
+	ctx context.Context,
 	handler handler,
 	defaults systemdefaults.SystemDefaults,
 	queries *query2.Queries,
@@ -43,16 +44,16 @@ func newExternalIDP(
 		queries:        queries,
 	}

-	h.subscribe()
+	h.subscribe(ctx)

 	return h
 }

-func (i *ExternalIDP) subscribe() {
+func (i *ExternalIDP) subscribe(ctx context.Context) {
 	i.subscription = i.es.Subscribe(i.AggregateTypes()...)
 	go func() {
 		for event := range i.subscription.Events {
-			query.ReduceEvent(i, event)
+			query.ReduceEvent(ctx, i, event)
 		}
 	}()
 }
@@ -77,8 +78,8 @@ func (i *ExternalIDP) CurrentSequence(instanceID string) (uint64, error) {
 	return sequence.CurrentSequence, nil
 }

-func (i *ExternalIDP) EventQuery(instanceIDs ...string) (*es_models.SearchQuery, error) {
-	sequences, err := i.view.GetLatestExternalIDPSequences(instanceIDs...)
+func (i *ExternalIDP) EventQuery(instanceIDs []string) (*es_models.SearchQuery, error) {
+	sequences, err := i.view.GetLatestExternalIDPSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -178,8 +179,8 @@ func (i *ExternalIDP) OnError(event *es_models.Event, err error) error {
 	return spooler.HandleError(event, err, i.view.GetLatestExternalIDPFailedEvent, i.view.ProcessedExternalIDPFailedEvent, i.view.ProcessedExternalIDPSequence, i.errorCountUntilSkip)
 }

-func (i *ExternalIDP) OnSuccess() error {
-	return spooler.HandleSuccess(i.view.UpdateExternalIDPSpoolerRunTimestamp)
+func (i *ExternalIDP) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(i.view.UpdateExternalIDPSpoolerRunTimestamp, instanceIDs)
 }

 func (i *ExternalIDP) getOrgIDPConfig(instanceID, aggregateID, idpConfigID string) (*query2.IDP, error) {
--- a/internal/auth/repository/eventsourcing/handler/user_session.go
+++ b/internal/auth/repository/eventsourcing/handler/user_session.go
@@ -33,22 +33,22 @@ type UserSession struct {
 	queries      *query2.Queries
 }

-func newUserSession(handler handler, queries *query2.Queries) *UserSession {
+func newUserSession(ctx context.Context, handler handler, queries *query2.Queries) *UserSession {
 	h := &UserSession{
 		handler: handler,
 		queries: queries,
 	}

-	h.subscribe()
+	h.subscribe(ctx)

 	return h
 }

-func (k *UserSession) subscribe() {
-	k.subscription = k.es.Subscribe(k.AggregateTypes()...)
+func (u *UserSession) subscribe(ctx context.Context) {
+	u.subscription = u.es.Subscribe(u.AggregateTypes()...)
 	go func() {
-		for event := range k.subscription.Events {
-			query.ReduceEvent(k, event)
+		for event := range u.subscription.Events {
+			query.ReduceEvent(ctx, u, event)
 		}
 	}()
 }
@@ -73,8 +73,8 @@ func (u *UserSession) CurrentSequence(instanceID string) (uint64, error) {
 	return sequence.CurrentSequence, nil
 }

-func (u *UserSession) EventQuery(instanceIDs ...string) (*models.SearchQuery, error) {
-	sequences, err := u.view.GetLatestUserSessionSequences(instanceIDs...)
+func (u *UserSession) EventQuery(instanceIDs []string) (*models.SearchQuery, error) {
+	sequences, err := u.view.GetLatestUserSessionSequences(instanceIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -162,12 +162,12 @@ func (u *UserSession) Reduce(event *models.Event) (err error) {
 }

 func (u *UserSession) OnError(event *models.Event, err error) error {
-	logging.LogWithFields("SPOOL-sdfw3s", "id", event.AggregateID).WithError(err).Warn("something went wrong in user session handler")
+	logging.WithFields("id", event.AggregateID).WithError(err).Warn("something went wrong in user session handler")
 	return spooler.HandleError(event, err, u.view.GetLatestUserSessionFailedEvent, u.view.ProcessedUserSessionFailedEvent, u.view.ProcessedUserSessionSequence, u.errorCountUntilSkip)
 }

-func (u *UserSession) OnSuccess() error {
-	return spooler.HandleSuccess(u.view.UpdateUserSessionSpoolerRunTimestamp)
+func (u *UserSession) OnSuccess(instanceIDs []string) error {
+	return spooler.HandleSuccess(u.view.UpdateUserSessionSpoolerRunTimestamp, instanceIDs)
 }

 func (u *UserSession) updateSession(session *view_model.UserSessionView, event *models.Event) error {