chore: (BRIDGE-253) removing unused telemetry (activation and troubleshooting)

internal/services/imapservice/connector.go

@@ -56,7 +56,6 @@ type Connector struct {
 
 	identityState sharedIdentity
 	client        APIClient
-	telemetry     Telemetry
 	reporter      reporter.Reporter
 	panicHandler  async.PanicHandler
 	sendRecorder  *sendrecorder.SendRecorder
@@ -80,7 +79,6 @@ func NewConnector(
 	addressMode usertypes.AddressMode,
 	sendRecorder *sendrecorder.SendRecorder,
 	panicHandler async.PanicHandler,
-	telemetry Telemetry,
 	reporter reporter.Reporter,
 	showAllMail bool,
 	syncState *SyncState,
@@ -96,7 +94,6 @@ func NewConnector(
 		attrs:         defaultMailboxAttributes(),
 
 		client:       apiClient,
-		telemetry:    telemetry,
 		reporter:     reporter,
 		panicHandler: panicHandler,
 		sendRecorder: sendRecorder,
@@ -169,10 +166,9 @@ func (s *Connector) Init(ctx context.Context, cache connector.IMAPState) error {
 	})
 }
 
-func (s *Connector) Authorize(ctx context.Context, username string, password []byte) bool {
+func (s *Connector) Authorize(_ context.Context, username string, password []byte) bool {
 	addrID, err := s.identityState.CheckAuth(username, password)
 	if err != nil {
-		s.telemetry.ReportConfigStatusFailure("IMAP " + err.Error())
 		return false
 	}
 
@@ -180,8 +176,6 @@ func (s *Connector) Authorize(ctx context.Context, username string, password []b
 		return false
 	}
 
-	s.telemetry.SendConfigStatusSuccess(ctx)
-
 	return true
 }
 

internal/services/imapservice/service.go

@@ -47,12 +47,6 @@ type EventProvider interface {
 	RewindEventID(ctx context.Context, eventID string) error
 }
 
-type Telemetry interface {
-	useridentity.Telemetry
-	SendConfigStatusSuccess(ctx context.Context)
-	ReportConfigStatusFailure(errDetails string)
-}
-
 type GluonIDProvider interface {
 	GetGluonID(addrID string) (string, bool)
 	GetGluonIDs() map[string]string
@@ -77,7 +71,6 @@ type Service struct {
 	serverManager   IMAPServerManager
 	eventPublisher  events.EventPublisher
 
-	telemetry    Telemetry
 	panicHandler async.PanicHandler
 	sendRecorder *sendrecorder.SendRecorder
 	reporter     reporter.Reporter
@@ -112,7 +105,6 @@ func NewService(
 	keyPassProvider useridentity.KeyPassProvider,
 	panicHandler async.PanicHandler,
 	sendRecorder *sendrecorder.SendRecorder,
-	telemetry Telemetry,
 	reporter reporter.Reporter,
 	addressMode usertypes.AddressMode,
 	subscription events.Subscription,
@@ -150,7 +142,6 @@ func NewService(
 
 		panicHandler: panicHandler,
 		sendRecorder: sendRecorder,
-		telemetry:    telemetry,
 		reporter:     reporter,
 
 		connectors:    make(map[string]*Connector),
@@ -513,7 +504,6 @@ func (s *Service) buildConnectors() (map[string]*Connector, error) {
 			s.addressMode,
 			s.sendRecorder,
 			s.panicHandler,
-			s.telemetry,
 			s.reporter,
 			s.showAllMail,
 			s.syncStateProvider,
@@ -531,7 +521,6 @@ func (s *Service) buildConnectors() (map[string]*Connector, error) {
 			s.addressMode,
 			s.sendRecorder,
 			s.panicHandler,
-			s.telemetry,
 			s.reporter,
 			s.showAllMail,
 			s.syncStateProvider,

internal/services/imapservice/service_address_events.go

@@ -154,7 +154,6 @@ func addNewAddressSplitMode(ctx context.Context, s *Service, addrID string) erro
 		s.addressMode,
 		s.sendRecorder,
 		s.panicHandler,
-		s.telemetry,
 		s.reporter,
 		s.showAllMail,
 		s.syncStateProvider,

internal/services/smtp/accounts.go

@@ -66,14 +66,9 @@ func (s *Accounts) CheckAuth(user string, password []byte) (string, string, erro
 			continue
 		}
 
-		account.service.telemetry.ReportSMTPAuthSuccess(context.Background())
 		return id, addrID, nil
 	}
 
-	for _, service := range s.accounts {
-		service.service.telemetry.ReportSMTPAuthFailed(user)
-	}
-
 	return "", "", ErrNoSuchUser
 }
 

internal/services/smtp/service.go

@@ -39,12 +39,6 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-type Telemetry interface {
-	useridentity.Telemetry
-	ReportSMTPAuthSuccess(context.Context)
-	ReportSMTPAuthFailed(username string)
-}
-
 type Service struct {
 	userID       string
 	panicHandler async.PanicHandler
@@ -57,7 +51,6 @@ type Service struct {
 	bridgePassProvider useridentity.BridgePassProvider
 	keyPassProvider    useridentity.KeyPassProvider
 	identityState      *useridentity.State
-	telemetry          Telemetry
 
 	eventService userevents.Subscribable
 	subscription *userevents.EventChanneledSubscriber
@@ -76,7 +69,6 @@ func NewService(
 	reporter reporter.Reporter,
 	bridgePassProvider useridentity.BridgePassProvider,
 	keyPassProvider useridentity.KeyPassProvider,
-	telemetry Telemetry,
 	eventService userevents.Subscribable,
 	mode usertypes.AddressMode,
 	identityState *useridentity.State,
@@ -99,7 +91,6 @@ func NewService(
 
 		bridgePassProvider: bridgePassProvider,
 		keyPassProvider:    keyPassProvider,
-		telemetry:          telemetry,
 		identityState:      identityState,
 		eventService:       eventService,
 

internal/services/useridentity/mocks/mocks.go

@@ -64,38 +64,3 @@ func (mr *MockIdentityProviderMockRecorder) GetUser(arg0 interface{}) *gomock.Ca
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUser", reflect.TypeOf((*MockIdentityProvider)(nil).GetUser), arg0)
 }
-
-// MockTelemetry is a mock of Telemetry interface.
-type MockTelemetry struct {
-	ctrl     *gomock.Controller
-	recorder *MockTelemetryMockRecorder
-}
-
-// MockTelemetryMockRecorder is the mock recorder for MockTelemetry.
-type MockTelemetryMockRecorder struct {
-	mock *MockTelemetry
-}
-
-// NewMockTelemetry creates a new mock instance.
-func NewMockTelemetry(ctrl *gomock.Controller) *MockTelemetry {
-	mock := &MockTelemetry{ctrl: ctrl}
-	mock.recorder = &MockTelemetryMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockTelemetry) EXPECT() *MockTelemetryMockRecorder {
-	return m.recorder
-}
-
-// ReportConfigStatusFailure mocks base method.
-func (m *MockTelemetry) ReportConfigStatusFailure(arg0 string) {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "ReportConfigStatusFailure", arg0)
-}
-
-// ReportConfigStatusFailure indicates an expected call of ReportConfigStatusFailure.
-func (mr *MockTelemetryMockRecorder) ReportConfigStatusFailure(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReportConfigStatusFailure", reflect.TypeOf((*MockTelemetry)(nil).ReportConfigStatusFailure), arg0)
-}

internal/services/useridentity/service.go

@@ -50,7 +50,6 @@ type Service struct {
 	subscription *userevents.EventChanneledSubscriber
 
 	bridgePassProvider BridgePassProvider
-	telemetry          Telemetry
 }
 
 func NewService(
@@ -58,7 +57,6 @@ func NewService(
 	eventPublisher events.EventPublisher,
 	state *State,
 	bridgePassProvider BridgePassProvider,
-	telemetry Telemetry,
 ) *Service {
 	subscriberName := fmt.Sprintf("identity-%v", state.User.ID)
 
@@ -73,7 +71,6 @@ func NewService(
 		}),
 		subscription:       userevents.NewEventSubscriber(subscriberName),
 		bridgePassProvider: bridgePassProvider,
-		telemetry:          telemetry,
 	}
 }
 

internal/services/useridentity/service_test.go

@@ -361,10 +361,9 @@ func newTestService(_ *testing.T, mockCtrl *gomock.Controller) (*Service, *mocks
 	eventPublisher := mocks2.NewMockEventPublisher(mockCtrl)
 	provider := mocks.NewMockIdentityProvider(mockCtrl)
 	user := newTestUser()
-	telemetry := mocks.NewMockTelemetry(mockCtrl)
 	bridgePassProvider := NewFixedBridgePassProvider([]byte("hello"))
 
-	service := NewService(subscribable, eventPublisher, NewState(*user, newTestAddresses(), provider), bridgePassProvider, telemetry)
+	service := NewService(subscribable, eventPublisher, NewState(*user, newTestAddresses(), provider), bridgePassProvider)
 	return service, eventPublisher, provider
 }
 

internal/services/useridentity/telemetry.go

@@ -1,22 +0,0 @@
-// Copyright (c) 2024 Proton AG
-//
-// This file is part of Proton Mail Bridge.
-//
-// Proton Mail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Proton Mail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
-
-package useridentity
-
-type Telemetry interface {
-	ReportConfigStatusFailure(errDetails string)
-}