mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2024-11-22 14:21:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Try to fix state reset sentry messages, maybe?"

Browse source 
This reverts commit 925843d05b.
This commit is contained in:
Till Faelligen 2023-12-29 23:03:53 +01:00
parent 925843d05b
commit 329d15ef44
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
2 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roomserver/internal/input/input.go
View file

@ -108,16 +108,12 @@ type worker struct {
r *Inputer
roomID string
subscription *nats.Subscription
sentryHub *sentry.Hub
}
func (r *Inputer) startWorkerForRoom(roomID string) {
v, loaded := r.workers.LoadOrStore(roomID, &worker{
r: r,
roomID: roomID,
// We're cloning the CurrentHub, as we otherwise get total garbage
// in sentry, with i.e. mismatching rooms and event_ids.
sentryHub: sentry.CurrentHub().Clone(),
})
w := v.(*worker)
w.Lock()
@ -269,7 +265,7 @@ func (w *worker) _next() {
// Look up what the next event is that's waiting to be processed.
ctx, cancel := context.WithTimeout(w.r.ProcessContext.Context(), time.Minute)
defer cancel()
if scope := w.sentryHub.Scope(); scope != nil {
if scope := sentry.CurrentHub().Scope(); scope != nil {
scope.SetTag("room_id", w.roomID)
}
msgs, err := w.subscription.Fetch(1, nats.Context(ctx))
@ -327,7 +323,7 @@ func (w *worker) _next() {
return
}
if scope := w.sentryHub.Scope(); scope != nil {
if scope := sentry.CurrentHub().Scope(); scope != nil {
scope.SetTag("event_id", inputRoomEvent.Event.EventID())
}
@ -351,7 +347,7 @@ func (w *worker) _next() {
}).Warn("Roomserver rejected event")
default:
if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) {
w.sentryHub.CaptureException(err)
sentry.CaptureException(err)
}
logrus.WithError(err).WithFields(logrus.Fields{
"room_id": w.roomID,

19
roomserver/internal/input/input_latest_events.go
View file

@ -79,26 +79,12 @@ func (r *Inputer) updateLatestEvents(
return nil
}
// Attempt to get Sentry hub
w, loaded := r.workers.Load(event.RoomID())
if !loaded {
// this _should_ never happen...
logrus.Panicf("failed to load worker on existing room")
}
s, ok := w.(*worker)
if !ok {
// this _should_ never happen as well...
logrus.Panicf("failed to get sentry hub from worker")
}
u := latestEventsUpdater{
api: r,
updater: updater,
stateAtEvent: stateAtEvent,
event: event,
rewritesState: rewritesState,
sentryHub: s.sentryHub,
}
var updates []api.OutputEvent
@ -163,7 +149,6 @@ type latestEventsUpdater struct {
// The snapshots of current state before and after processing this event
oldStateNID types.StateSnapshotNID
newStateNID types.StateSnapshotNID
sentryHub *sentry.Hub
}
func (u *latestEventsUpdater) doUpdateLatestEvents(ctx context.Context, roomInfo *types.RoomInfo) ([]api.OutputEvent, error) {
@ -303,7 +288,7 @@ func (u *latestEventsUpdater) latestState(ctx context.Context, roomInfo *types.R
"rewrites_state": u.rewritesState,
"state_at_event": fmt.Sprintf("%#v", u.stateAtEvent),
}).Warnf("State reset detected (removing %d events)", removed)
u.sentryHub.WithScope(func(scope *sentry.Scope) {
sentry.WithScope(func(scope *sentry.Scope) {
scope.SetLevel("warning")
scope.SetContext("State reset", map[string]interface{}{
"Event ID": u.event.EventID(),
@ -315,7 +300,7 @@ func (u *latestEventsUpdater) latestState(ctx context.Context, roomInfo *types.R
"State rewritten": fmt.Sprintf("%v", u.rewritesState),
"State at event": fmt.Sprintf("%#v", u.stateAtEvent),
})
u.sentryHub.CaptureMessage("State reset detected")
sentry.CaptureMessage("State reset detected")
})
}