fix: add sentry in ui, http and projection handlers (#1977)

* fix: add sentry in ui, http and projection handlers * fix test
zitadel · Jul 6, 2021 · 0e472a3 · 0e472a3
1 parent 9277928
commit 0e472a3
Show file tree

Hide file tree

Showing 78 changed files with 339 additions and 11 deletions.
diff --git a/internal/admin/repository/eventsourcing/handler/custom_text.go b/internal/admin/repository/eventsourcing/handler/custom_text.go
@@ -40,6 +40,10 @@ const (
 	customTextTable = "adminapi.custom_texts"
 )
 
+func (m *CustomText) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
 func (m *CustomText) ViewModel() string {
 	return customTextTable
 }

diff --git a/internal/admin/repository/eventsourcing/handler/features.go b/internal/admin/repository/eventsourcing/handler/features.go
@@ -47,6 +47,10 @@ func (p *Features) subscribe() {
 	}()
 }
 
+func (p *Features) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (p *Features) ViewModel() string {
 	return featuresTable
 }

diff --git a/internal/admin/repository/eventsourcing/handler/iam_member.go b/internal/admin/repository/eventsourcing/handler/iam_member.go
@@ -49,7 +49,6 @@ func (m *IAMMember) subscribe() {
 
 	go func() {
 		for event := range m.subscription.Events {
-
 			query.ReduceEvent(m, event)
 		}
 	}()
@@ -67,6 +66,10 @@ func (m *IAMMember) ViewModel() string {
 	return iamMemberTable
 }
 
+func (m *IAMMember) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
 func (m *IAMMember) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.IAMAggregate, usr_es_model.UserAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/idp_config.go b/internal/admin/repository/eventsourcing/handler/idp_config.go
@@ -39,6 +39,10 @@ func (i *IDPConfig) subscribe() {
 	}()
 }
 
+func (i *IDPConfig) Subscription() *v1.Subscription {
+	return i.subscription
+}
+
 func (i *IDPConfig) ViewModel() string {
 	return idpConfigTable
 }

diff --git a/internal/admin/repository/eventsourcing/handler/idp_providers.go b/internal/admin/repository/eventsourcing/handler/idp_providers.go
@@ -54,6 +54,10 @@ func (i *IDPProvider) subscribe() {
 	}()
 }
 
+func (i *IDPProvider) Subscription() *v1.Subscription {
+	return i.subscription
+}
+
 func (i *IDPProvider) ViewModel() string {
 	return idpProviderTable
 }

diff --git a/internal/admin/repository/eventsourcing/handler/label_policy.go b/internal/admin/repository/eventsourcing/handler/label_policy.go
@@ -44,6 +44,10 @@ func (p *LabelPolicy) ViewModel() string {
 	return labelPolicyTable
 }
 
+func (p *LabelPolicy) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (p *LabelPolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/login_policy.go b/internal/admin/repository/eventsourcing/handler/login_policy.go
@@ -2,7 +2,9 @@ package handler
 
 import (
 	"context"
+
 	"github.com/caos/logging"
+
 	"github.com/caos/zitadel/internal/domain"
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/v1"
@@ -12,7 +14,7 @@ import (
 	"github.com/caos/zitadel/internal/iam/repository/eventsourcing"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 	iam_model "github.com/caos/zitadel/internal/iam/repository/view/model"
-	model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
+	"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
 )
 
 const (
@@ -47,6 +49,10 @@ func (p *LoginPolicy) ViewModel() string {
 	return loginPolicyTable
 }
 
+func (p *LoginPolicy) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (p *LoginPolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{iam_es_model.IAMAggregate, model.OrgAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/mail_template.go b/internal/admin/repository/eventsourcing/handler/mail_template.go
@@ -44,12 +44,16 @@ func (m *MailTemplate) ViewModel() string {
 	return mailTemplateTable
 }
 
-func (_ *MailTemplate) AggregateTypes() []es_models.AggregateType {
+func (m *MailTemplate) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
+func (m *MailTemplate) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{iam_es_model.IAMAggregate}
 }
 
-func (p *MailTemplate) CurrentSequence() (uint64, error) {
-	sequence, err := p.view.GetLatestMailTemplateSequence()
+func (m *MailTemplate) CurrentSequence() (uint64, error) {
+	sequence, err := m.view.GetLatestMailTemplateSequence()
 	if err != nil {
 		return 0, err
 	}
@@ -99,6 +103,6 @@ func (m *MailTemplate) OnError(event *es_models.Event, err error) error {
 	return spooler.HandleError(event, err, m.view.GetLatestMailTemplateFailedEvent, m.view.ProcessedMailTemplateFailedEvent, m.view.ProcessedMailTemplateSequence, m.errorCountUntilSkip)
 }
 
-func (o *MailTemplate) OnSuccess() error {
-	return spooler.HandleSuccess(o.view.UpdateMailTemplateSpoolerRunTimestamp)
+func (m *MailTemplate) OnSuccess() error {
+	return spooler.HandleSuccess(m.view.UpdateMailTemplateSpoolerRunTimestamp)
 }
diff --git a/internal/admin/repository/eventsourcing/handler/message_text.go b/internal/admin/repository/eventsourcing/handler/message_text.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"github.com/caos/logging"
+
 	caos_errs "github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/v1"
 
@@ -45,6 +46,10 @@ func (m *MessageText) ViewModel() string {
 	return mailTextTable
 }
 
+func (m *MessageText) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
 func (_ *MessageText) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{iam_es_model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/org.go b/internal/admin/repository/eventsourcing/handler/org.go
@@ -44,6 +44,10 @@ func (o *Org) ViewModel() string {
 	return orgTable
 }
 
+func (o *Org) Subscription() *v1.Subscription {
+	return o.subscription
+}
+
 func (o *Org) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/org_iam_policy.go b/internal/admin/repository/eventsourcing/handler/org_iam_policy.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"github.com/caos/logging"
+
 	"github.com/caos/zitadel/internal/eventstore/v1"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/eventstore/v1/query"
@@ -43,6 +44,10 @@ func (p *OrgIAMPolicy) ViewModel() string {
 	return orgIAMPolicyTable
 }
 
+func (p *OrgIAMPolicy) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (p *OrgIAMPolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/password_age_policy.go b/internal/admin/repository/eventsourcing/handler/password_age_policy.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"github.com/caos/logging"
+
 	"github.com/caos/zitadel/internal/eventstore/v1"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 
@@ -44,6 +45,10 @@ func (p *PasswordAgePolicy) ViewModel() string {
 	return passwordAgePolicyTable
 }
 
+func (p *PasswordAgePolicy) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (p *PasswordAgePolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/password_complexity_policy.go b/internal/admin/repository/eventsourcing/handler/password_complexity_policy.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"github.com/caos/logging"
+
 	"github.com/caos/zitadel/internal/eventstore/v1"
 	iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
 
@@ -44,6 +45,10 @@ func (p *PasswordComplexityPolicy) ViewModel() string {
 	return passwordComplexityPolicyTable
 }
 
+func (m *PasswordComplexityPolicy) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
 func (p *PasswordComplexityPolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/password_lockout_policy.go b/internal/admin/repository/eventsourcing/handler/password_lockout_policy.go
@@ -44,6 +44,10 @@ func (p *PasswordLockoutPolicy) ViewModel() string {
 	return passwordLockoutPolicyTable
 }
 
+func (m *PasswordLockoutPolicy) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
 func (p *PasswordLockoutPolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/privacy_policy.go b/internal/admin/repository/eventsourcing/handler/privacy_policy.go
@@ -44,6 +44,10 @@ func (p *PrivacyPolicy) ViewModel() string {
 	return privacyPolicyTable
 }
 
+func (p *PrivacyPolicy) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (p *PrivacyPolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/styling.go b/internal/admin/repository/eventsourcing/handler/styling.go
@@ -63,6 +63,10 @@ func (m *Styling) ViewModel() string {
 	return stylingTable
 }
 
+func (m *Styling) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
 func (_ *Styling) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/user.go b/internal/admin/repository/eventsourcing/handler/user.go
@@ -60,6 +60,10 @@ func (u *User) ViewModel() string {
 	return userTable
 }
 
+func (u *User) Subscription() *v1.Subscription {
+	return u.subscription
+}
+
 func (u *User) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{es_model.UserAggregate, org_es_model.OrgAggregate}
 }

diff --git a/internal/admin/repository/eventsourcing/handler/user_external_idps.go b/internal/admin/repository/eventsourcing/handler/user_external_idps.go
@@ -59,6 +59,10 @@ func (i *ExternalIDP) ViewModel() string {
 	return externalIDPTable
 }
 
+func (i *ExternalIDP) Subscription() *v1.Subscription {
+	return i.subscription
+}
+
 func (i *ExternalIDP) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.UserAggregate, iam_es_model.IAMAggregate, org_es_model.OrgAggregate}
 }

diff --git a/internal/api/api.go b/internal/api/api.go
@@ -8,6 +8,7 @@ import (
 	"github.com/caos/zitadel/internal/telemetry/metrics"
 	"github.com/caos/zitadel/internal/telemetry/metrics/otel"
 	view_model "github.com/caos/zitadel/internal/view/model"
+	sentryhttp "github.com/getsentry/sentry-go/http"
 	"go.opentelemetry.io/otel/api/metric"
 	"net/http"
 
@@ -78,7 +79,8 @@ func (a *API) RegisterServer(ctx context.Context, server server.Server) {
 }
 
 func (a *API) RegisterHandler(prefix string, handler http.Handler) {
-	a.gatewayHandler.RegisterHandler(prefix, handler)
+	sentryHandler := sentryhttp.New(sentryhttp.Options{})
+	a.gatewayHandler.RegisterHandler(prefix, sentryHandler.Handle(handler))
 }
 
 func (a *API) Start(ctx context.Context) {

diff --git a/internal/auth/repository/eventsourcing/handler/application.go b/internal/auth/repository/eventsourcing/handler/application.go
@@ -49,6 +49,10 @@ func (a *Application) ViewModel() string {
 	return applicationTable
 }
 
+func (a *Application) Subscription() *v1.Subscription {
+	return a.subscription
+}
+
 func (_ *Application) AggregateTypes() []models.AggregateType {
 	return []models.AggregateType{es_model.ProjectAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/authn_keys.go b/internal/auth/repository/eventsourcing/handler/authn_keys.go
@@ -46,6 +46,10 @@ func (k *AuthNKeys) ViewModel() string {
 	return authnKeysTable
 }
 
+func (k *AuthNKeys) Subscription() *v1.Subscription {
+	return k.subscription
+}
+
 func (_ *AuthNKeys) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{user_model.UserAggregate, proj_model.ProjectAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/custom_text.go b/internal/auth/repository/eventsourcing/handler/custom_text.go
@@ -44,6 +44,10 @@ func (m *CustomText) ViewModel() string {
 	return customTextTable
 }
 
+func (m *CustomText) Subscription() *v1.Subscription {
+	return m.subscription
+}
+
 func (_ *CustomText) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/features.go b/internal/auth/repository/eventsourcing/handler/features.go
@@ -51,6 +51,10 @@ func (p *Features) ViewModel() string {
 	return featuresTable
 }
 
+func (p *Features) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (p *Features) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{iam_es_model.IAMAggregate, org_es_model.OrgAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/idp_config.go b/internal/auth/repository/eventsourcing/handler/idp_config.go
@@ -44,6 +44,10 @@ func (i *IDPConfig) ViewModel() string {
 	return idpConfigTable
 }
 
+func (i *IDPConfig) Subscription() *v1.Subscription {
+	return i.subscription
+}
+
 func (_ *IDPConfig) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/idp_providers.go b/internal/auth/repository/eventsourcing/handler/idp_providers.go
@@ -59,6 +59,10 @@ func (i *IDPProvider) ViewModel() string {
 	return idpProviderTable
 }
 
+func (i *IDPProvider) Subscription() *v1.Subscription {
+	return i.subscription
+}
+
 func (_ *IDPProvider) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.IAMAggregate, org_es_model.OrgAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/key.go b/internal/auth/repository/eventsourcing/handler/key.go
@@ -49,6 +49,10 @@ func (k *Key) ViewModel() string {
 	return keyTable
 }
 
+func (k *Key) Subscription() *v1.Subscription {
+	return k.subscription
+}
+
 func (_ *Key) AggregateTypes() []models.AggregateType {
 	return []models.AggregateType{es_model.KeyPairAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/label_policy.go b/internal/auth/repository/eventsourcing/handler/label_policy.go
@@ -46,6 +46,10 @@ func (m *LabelPolicy) ViewModel() string {
 	return labelPolicyTable
 }
 
+func (p *LabelPolicy) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (_ *LabelPolicy) AggregateTypes() []models.AggregateType {
 	return []models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }

diff --git a/internal/auth/repository/eventsourcing/handler/login_policy.go b/internal/auth/repository/eventsourcing/handler/login_policy.go
@@ -48,6 +48,10 @@ func (p *LoginPolicy) ViewModel() string {
 	return loginPolicyTable
 }
 
+func (p *LoginPolicy) Subscription() *v1.Subscription {
+	return p.subscription
+}
+
 func (_ *LoginPolicy) AggregateTypes() []es_models.AggregateType {
 	return []es_models.AggregateType{model.OrgAggregate, iam_es_model.IAMAggregate}
 }