feat(BRIDGE-204): removed redundant Sentry events

internal/bridge/sentry_test.go

@@ -29,13 +29,12 @@ import (
 	"github.com/ProtonMail/proton-bridge/v3/internal/bridge"
 	"github.com/ProtonMail/proton-bridge/v3/internal/constants"
 	"github.com/ProtonMail/proton-bridge/v3/internal/events"
-	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 )
 
 func TestBridge_Report(t *testing.T) {
 	withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) {
-		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, mocks *bridge.Mocks) {
+		withBridge(ctx, t, s.GetHostURL(), netCtl, locator, storeKey, func(b *bridge.Bridge, _ *bridge.Mocks) {
 			syncCh, done := chToType[events.Event, events.SyncFinished](b.GetEvents(events.SyncFinished{}))
 			defer done()
 
@@ -56,12 +55,6 @@ func TestBridge_Report(t *testing.T) {
 			require.NoError(t, err)
 			defer func() { require.NoError(t, conn.Close()) }()
 
-			// Sending garbage to the IMAP port should cause the bridge to report it.
-			mocks.Reporter.EXPECT().ReportMessageWithContext(
-				gomock.Eq("Failed to parse IMAP command"),
-				gomock.Any(),
-			).Return(nil)
-
 			// Read lines from the IMAP port.
 			lineCh := liner.New(conn).Lines(func() error { return nil })
 

internal/bridge/user_events.go

@@ -38,9 +38,6 @@ func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, even
 
 	case events.UserLoadedCheckResync:
 		user.VerifyResyncAndExecute()
-
-	case events.UncategorizedEventError:
-		bridge.handleUncategorizedErrorEvent(event)
 	}
 }
 
@@ -67,12 +64,3 @@ func (bridge *Bridge) handleUserBadEvent(ctx context.Context, user *user.User, e
 		user.OnBadEvent(ctx)
 	}, bridge.usersLock)
 }
-
-func (bridge *Bridge) handleUncategorizedErrorEvent(event events.UncategorizedEventError) {
-	if rerr := bridge.reporter.ReportMessageWithContext("Failed to handle due to uncategorized error", reporter.Context{
-		"error_type": internal.ErrCauseType(event.Error),
-		"error":      event.Error,
-	}); rerr != nil {
-		logrus.WithField("pkg", "bridge/event").WithError(rerr).Error("Failed to report failed event handling")
-	}
-}

internal/frontend/bridge-gui/bridge-gui/main.cpp

@@ -54,6 +54,7 @@ QString const bridgeGUILock = "bridge-v3-gui.lock"; ///< The file name used for
 QString const exeName = "bridge" + exeSuffix; ///< The bridge executable file name.*
 qint64 constexpr grpcServiceConfigWaitDelayMs = 180000; ///< The wait delay for the gRPC config file in milliseconds.
 QString const waitFlag = "--wait"; ///< The wait command-line flag.
+QString const orphanInstanceException =  "An orphan instance of bridge is already running. Please terminate it and relaunch the application.";
 
 } // anonymous namespace
 
@@ -317,7 +318,7 @@ int main(int argc, char *argv[]) {
         QString bridgeExe;
         if (!cliOptions.attach) {
             if (isBridgeRunning()) {
-                throw Exception("An orphan instance of bridge is already running. Please terminate it and relaunch the application.",
+                throw Exception(orphanInstanceException,
                     QString(), __FUNCTION__, tailOfLatestBridgeLog(sessionID));
             }
 
@@ -413,13 +414,18 @@ int main(int argc, char *argv[]) {
         lock.unlock();
         return result;
     } catch (Exception const &e) {
-        sentry_uuid_s const uuid = reportSentryException("Exception occurred during main", e);
         QString message = e.qwhat();
         if (e.showSupportLink()) {
             message += R"(<br/><br/>If the issue persists, please contact our <a href="https://proton.me/support/contact">customer support</a>.)";
         }
         QMessageBox::critical(nullptr, "Error", message);
-        QTextStream(stderr) << "reportID: " << QByteArray(uuid.bytes, 16).toHex() << " Captured exception :" << e.detailedWhat() << "\n";
+
+        if (e.qwhat() != orphanInstanceException) {
+            sentry_uuid_s const uuid = reportSentryException("Exception occurred during main", e);
+            QTextStream(stderr) << "reportID: " << QByteArray(uuid.bytes, 16).toHex() << " Captured exception :"
+                                << e.detailedWhat() << "\n";
+        }
+
         return EXIT_FAILURE;
     }
 }

internal/services/imapservice/connector.go

@@ -31,7 +31,6 @@ import (
 	"github.com/ProtonMail/gluon/connector"
 	"github.com/ProtonMail/gluon/imap"
 	"github.com/ProtonMail/gluon/reporter"
-	"github.com/ProtonMail/gluon/rfc5322"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/ProtonMail/go-proton-api"
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
@@ -690,8 +689,6 @@ func (s *Connector) importMessage(
 
 	isDraft := slices.Contains(labelIDs, proton.DraftsLabel)
 
-	s.reportGODT3185(isDraft, addr.Email, p, s.addressMode == usertypes.AddressModeCombined)
-
 	if err := s.identityState.WithAddrKR(s.addrID, func(_, addrKR *crypto.KeyRing) error {
 		primaryKey, errKey := addrKR.FirstKey()
 		if errKey != nil {
@@ -877,80 +874,3 @@ func stripPlusAlias(a string) string {
 func equalAddresses(a, b string) bool {
 	return strings.EqualFold(stripPlusAlias(a), stripPlusAlias(b))
 }
-
-func (s *Connector) reportGODT3185(isDraft bool, defaultAddr string, p *parser.Parser, isCombinedMode bool) {
-	reportAction := "draft"
-	if !isDraft {
-		reportAction = "import"
-	}
-
-	reportMode := "combined"
-	if !isCombinedMode {
-		reportMode = "split"
-	}
-
-	senderAddr := ""
-	if p != nil && p.Root() != nil && p.Root().Header.Len() != 0 {
-		addrField := p.Root().Header.Get("From")
-		if addrField == "" {
-			addrField = p.Root().Header.Get("Sender")
-		}
-		if addrField != "" {
-			sender, err := rfc5322.ParseAddressList(addrField)
-			if err == nil && len(sender) > 0 {
-				senderAddr = sender[0].Address
-			} else {
-				s.log.WithError(err).Warn("Invalid sender address in reporter")
-			}
-		}
-	}
-
-	if equalAddresses(defaultAddr, senderAddr) {
-		return
-	}
-
-	isDisabled := false
-	isUserAddress := false
-	for _, a := range s.identityState.GetAddresses() {
-		if !equalAddresses(a.Email, senderAddr) {
-			continue
-		}
-
-		isUserAddress = true
-		isDisabled = !bool(a.Send) || (a.Status != proton.AddressStatusEnabled)
-		break
-	}
-
-	if !isUserAddress && senderAddr != "" {
-		return
-	}
-
-	reportResult := "using sender address"
-
-	if !isCombinedMode {
-		reportResult = "error address not match"
-	}
-
-	reportAddress := ""
-	if senderAddr == "" {
-		reportAddress = " invalid"
-		reportResult = "error import/draft"
-	}
-
-	if isDisabled {
-		reportAddress = " disabled"
-		if isDraft {
-			reportResult = "error draft"
-		}
-	}
-
-	report := fmt.Sprintf(
-		"GODT-3185: %s with non-default%s address in %s mode: %s",
-		reportAction, reportAddress, reportMode, reportResult,
-	)
-
-	s.log.Warn(report)
-	if s.reporter != nil {
-		_ = s.reporter.ReportMessage(report)
-	}
-}

internal/services/smtp/smtp.go

@@ -30,7 +30,6 @@ import (
 	"time"
 
 	"github.com/ProtonMail/gluon/async"
-	"github.com/ProtonMail/gluon/reporter"
 	"github.com/ProtonMail/gluon/rfc5322"
 	"github.com/ProtonMail/gluon/rfc822"
 	"github.com/ProtonMail/go-proton-api"
@@ -197,13 +196,7 @@ func (s *Service) sendWithKey(
 	}
 	parentID, draftsToDelete, err := getParentID(ctx, s.client, authAddrID, addrMode, references)
 	if err != nil {
-		if err := s.reporter.ReportMessageWithContext("Failed to get parent ID", reporter.Context{
-			"error":      err,
-			"references": message.References,
-		}); err != nil {
-			logrus.WithError(err).Error("Failed to report error")
-		}
-
+		// Sentry event has been removed; should be replaced with observability - BRIDGE-206.
 		s.log.WithError(err).Warn("Failed to get parent ID")
 	}