Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from Jul 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -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
}
Expand Down
4 changes: 4 additions & 0 deletions internal/admin/repository/eventsourcing/handler/features.go
Expand Up @@ -47,6 +47,10 @@ func (p *Features) subscribe() {
}()
}

func (p *Features) Subscription() *v1.Subscription {
return p.subscription
}

func (p *Features) ViewModel() string {
return featuresTable
}
Expand Down
Expand Up @@ -49,7 +49,6 @@ func (m *IAMMember) subscribe() {

go func() {
for event := range m.subscription.Events {

query.ReduceEvent(m, event)
}
}()
Expand All @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/admin/repository/eventsourcing/handler/idp_config.go
Expand Up @@ -39,6 +39,10 @@ func (i *IDPConfig) subscribe() {
}()
}

func (i *IDPConfig) Subscription() *v1.Subscription {
return i.subscription
}

func (i *IDPConfig) ViewModel() string {
return idpConfigTable
}
Expand Down
Expand Up @@ -54,6 +54,10 @@ func (i *IDPProvider) subscribe() {
}()
}

func (i *IDPProvider) Subscription() *v1.Subscription {
return i.subscription
}

func (i *IDPProvider) ViewModel() string {
return idpProviderTable
}
Expand Down
Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down Expand Up @@ -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}
}
Expand Down
14 changes: 9 additions & 5 deletions internal/admin/repository/eventsourcing/handler/mail_template.go
Expand Up @@ -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
}
Expand Down Expand Up @@ -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)
}
Expand Up @@ -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"

Expand Down Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/admin/repository/eventsourcing/handler/org.go
Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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"
Expand Down Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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"

Expand Down Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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"

Expand Down Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/admin/repository/eventsourcing/handler/styling.go
Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/admin/repository/eventsourcing/handler/user.go
Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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}
}
Expand Down
4 changes: 3 additions & 1 deletion internal/api/api.go
Expand Up @@ -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"

Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 4 additions & 0 deletions internal/auth/repository/eventsourcing/handler/application.go
Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/auth/repository/eventsourcing/handler/authn_keys.go
Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/auth/repository/eventsourcing/handler/custom_text.go
Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/auth/repository/eventsourcing/handler/features.go
Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/auth/repository/eventsourcing/handler/idp_config.go
Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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}
}
Expand Down
4 changes: 4 additions & 0 deletions internal/auth/repository/eventsourcing/handler/key.go
Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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}
}
Expand Down
Expand Up @@ -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}
}
Expand Down