GODT-1036 Event loop Sentry reporting of failures and refresh

internal/store/event_loop.go

@@ -28,8 +28,13 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-const pollInterval = 30 * time.Second
-const pollIntervalSpread = 5 * time.Second
+const (
+	pollInterval       = 30 * time.Second
+	pollIntervalSpread = 5 * time.Second
+
+	// errMaxSentry defines after how many errors in a row to report it to sentry.
+	errMaxSentry = 20
+)
 
 type eventLoop struct {
 	cache          *Cache
@@ -41,6 +46,7 @@ type eventLoop struct {
 	isRunning      bool // The whole event loop is running.
 
 	pollCounter int
+	errCounter  int
 
 	log *logrus.Entry
 
@@ -227,9 +233,18 @@ func (loop *eventLoop) processNextEvent() (more bool, err error) { // nolint[fun
 
 		_, errUnauthorized := errors.Cause(err).(*pmapi.ErrUnauthorized)
 
+		if err == nil {
+			loop.errCounter = 0
+		}
 		// All errors except Invalid Token (which is not possible to recover from) are ignored.
 		if err != nil && !errUnauthorized && errors.Cause(err) != pmapi.ErrInvalidToken {
-			l.WithError(err).Error("Error skipped")
+			l.WithError(err).WithField("errors", loop.errCounter).Error("Error skipped")
+			loop.errCounter++
+			if loop.errCounter == errMaxSentry {
+				if sentryErr := loop.store.sentryReporter.ReportMessage("Warning: event loop issues: " + err.Error() + ", " + loop.currentEventID); sentryErr != nil {
+					l.WithError(sentryErr).Error("Failed to report error to sentry")
+				}
+			}
 			err = nil
 		}
 	}()
@@ -283,6 +298,10 @@ func (loop *eventLoop) processEvent(event *pmapi.Event) (err error) {
 		eventLog.Info("Processing refresh event")
 		loop.store.triggerSync()
 
+		if sentryErr := loop.store.sentryReporter.ReportMessage("Warning: refresh occurred, " + loop.currentEventID); sentryErr != nil {
+			loop.log.WithError(sentryErr).Error("Failed to report refresh to sentry")
+		}
+
 		return
 	}
 

internal/store/store.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/ProtonMail/proton-bridge/pkg/listener"
 	"github.com/ProtonMail/proton-bridge/pkg/pmapi"
+	"github.com/ProtonMail/proton-bridge/pkg/sentry"
 	"github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -95,10 +96,11 @@ var (
 
 // Store is local user storage, which handles the synchronization between IMAP and PM API.
 type Store struct {
-	panicHandler  PanicHandler
-	eventLoop     *eventLoop
-	user          BridgeUser
-	clientManager ClientManager
+	sentryReporter *sentry.Reporter
+	panicHandler   PanicHandler
+	eventLoop      *eventLoop
+	user           BridgeUser
+	clientManager  ClientManager
 
 	log *logrus.Entry
 
@@ -115,7 +117,8 @@ type Store struct {
 }
 
 // New creates or opens a store for the given `user`.
-func New(
+func New( // nolint[funlen]
+	sentryReporter *sentry.Reporter,
 	panicHandler PanicHandler,
 	user BridgeUser,
 	clientManager ClientManager,
@@ -145,14 +148,15 @@ func New(
 	}
 
 	store = &Store{
-		panicHandler:  panicHandler,
-		clientManager: clientManager,
-		user:          user,
-		cache:         cache,
-		filePath:      path,
-		db:            bdb,
-		lock:          &sync.RWMutex{},
-		log:           l,
+		sentryReporter: sentryReporter,
+		panicHandler:   panicHandler,
+		clientManager:  clientManager,
+		user:           user,
+		cache:          cache,
+		filePath:       path,
+		db:             bdb,
+		lock:           &sync.RWMutex{},
+		log:            l,
 	}
 
 	// Minimal increase is event pollInterval, doubles every failed retry up to 5 minutes.

internal/store/store_test.go

@@ -125,6 +125,7 @@ func (mocks *mocksForStore) newStoreNoEvents(combinedMode bool, msgs ...*pmapi.M
 
 	var err error
 	mocks.store, err = New(
+		nil, // Sentry reporter is not used under unit tests.
 		mocks.panicHandler,
 		mocks.user,
 		mocks.clientManager,