From 329d15ef4415fa04678c58a716ebb15c0889159b Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Fri, 29 Dec 2023 23:03:53 +0100
Subject: [PATCH] Revert "Try to fix state reset sentry messages, maybe?"

This reverts commit 925843d05bbd9af078f6d7bfc356c530002e6d9d.
---
 roomserver/internal/input/input.go            | 10 +++-------
 .../internal/input/input_latest_events.go     | 19 ++-----------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
index f37a04175..20d2cfc7a 100644
--- a/roomserver/internal/input/input.go
+++ b/roomserver/internal/input/input.go
@@ -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,
diff --git a/roomserver/internal/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go
index e07a05213..cf4fe04be 100644
--- a/roomserver/internal/input/input_latest_events.go
+++ b/roomserver/internal/input/input_latest_events.go
@@ -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")
 		})
 	}