From 7021b1c2eadf3df950ca65f4c13f5a164aa80fbc Mon Sep 17 00:00:00 2001
From: Atanas Janeshliev <atanas.janeshliev@proton.ch>
Date: Mon, 21 Oct 2024 09:16:56 +0000
Subject: [PATCH] feat(BRIDGE-228): removed sentry events:

---
 go.mod                                        |  2 +-
 go.sum                                        |  4 ++++
 internal/bridge/user.go                       | 14 --------------
 internal/services/observability/test_utils.go |  1 +
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index a83a2596..aa8aac2a 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.21.9
 require (
 	github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
 	github.com/Masterminds/semver/v3 v3.2.0
-	github.com/ProtonMail/gluon v0.17.1-0.20241008123701-ddf4a459d0b4
+	github.com/ProtonMail/gluon v0.17.1-0.20241018144126-31e040c2417e
 	github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
 	github.com/ProtonMail/go-proton-api v0.4.1-0.20240918100656-b4860af56d47
 	github.com/ProtonMail/gopenpgp/v2 v2.7.4-proton
diff --git a/go.sum b/go.sum
index 85e7cd0d..e936d2d0 100644
--- a/go.sum
+++ b/go.sum
@@ -44,6 +44,10 @@ github.com/ProtonMail/gluon v0.17.1-0.20241002142736-ef4153d156d8 h1:YxPHSJUA87i
 github.com/ProtonMail/gluon v0.17.1-0.20241002142736-ef4153d156d8/go.mod h1:0/c03TzZPNiSgY5UDJK1iRDkjlDPwWugxTT6et2qDu8=
 github.com/ProtonMail/gluon v0.17.1-0.20241008123701-ddf4a459d0b4 h1:xE+V17O9HIttMpVymNCORQILk9OKpSekrrPbX7YGnF8=
 github.com/ProtonMail/gluon v0.17.1-0.20241008123701-ddf4a459d0b4/go.mod h1:0/c03TzZPNiSgY5UDJK1iRDkjlDPwWugxTT6et2qDu8=
+github.com/ProtonMail/gluon v0.17.1-0.20241014082854-9d93627be032 h1:5bwI+mwF26c460xlq2Dw3/cVF1cU4Xo4kTKX1/pBXko=
+github.com/ProtonMail/gluon v0.17.1-0.20241014082854-9d93627be032/go.mod h1:0/c03TzZPNiSgY5UDJK1iRDkjlDPwWugxTT6et2qDu8=
+github.com/ProtonMail/gluon v0.17.1-0.20241018144126-31e040c2417e h1:+UfdKOkF9JEiH9VXWBo+/nlXNVSJcxtuf4+SJTrk9fw=
+github.com/ProtonMail/gluon v0.17.1-0.20241018144126-31e040c2417e/go.mod h1:0/c03TzZPNiSgY5UDJK1iRDkjlDPwWugxTT6et2qDu8=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
 github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=
diff --git a/internal/bridge/user.go b/internal/bridge/user.go
index 118f7b2b..fe87ae20 100644
--- a/internal/bridge/user.go
+++ b/internal/bridge/user.go
@@ -355,23 +355,9 @@ func (bridge *Bridge) SendBadEventUserFeedback(_ context.Context, userID string,
 		}
 
 		if doResync {
-			if rerr := bridge.reporter.ReportMessageWithContext(
-				"Failed to handle event: feedback resync",
-				reporter.Context{"user_id": userID},
-			); rerr != nil {
-				logUser.WithError(rerr).Error("Failed to report feedback failure")
-			}
-
 			return user.BadEventFeedbackResync(ctx)
 		}
 
-		if rerr := bridge.reporter.ReportMessageWithContext(
-			"Failed to handle event: feedback logout",
-			reporter.Context{"user_id": userID},
-		); rerr != nil {
-			logUser.WithError(rerr).Error("Failed to report feedback failure")
-		}
-
 		bridge.logoutUser(ctx, user, true, false, false)
 
 		bridge.publish(events.UserLoggedOut{
diff --git a/internal/services/observability/test_utils.go b/internal/services/observability/test_utils.go
index f1ca97f5..115b28be 100644
--- a/internal/services/observability/test_utils.go
+++ b/internal/services/observability/test_utils.go
@@ -121,6 +121,7 @@ func GenerateAllGluonMetrics() []map[string]interface{} {
 		gluonMetrics.GenerateFailedToCommitDatabaseTransactionMetric(),
 		gluonMetrics.GenerateAppendToDraftsMustNotReturnExistingRemoteID(),
 		gluonMetrics.GenerateDatabaseMigrationFailed(),
+		gluonMetrics.GenerateFailedToStoreFlagsOnMessages(),
 	)
 	return metrics
 }