Don't emit logs on Cloud. (#39462)

Updated `events.LoggingEmitter` to detect if running on Cloud both cluster features and modules.
gravitational · Mar 17, 2024 · e9e16ba · e9e16ba
1 parent 5c06dd0
commit e9e16ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/events/emitter.go b/lib/events/emitter.go
@@ -250,9 +250,9 @@ func (w *WriterEmitter) EmitAuditEvent(ctx context.Context, event apievents.Audi
 // NewLoggingEmitter returns an emitter that logs all events to the console
 // with the info level. Events are only logged for self-hosted installations,
 // Teleport Cloud treats this as a no-op.
-func NewLoggingEmitter() *LoggingEmitter {
+func NewLoggingEmitter(cloud bool) *LoggingEmitter {
 	return &LoggingEmitter{
-		emit: !modules.GetModules().Features().Cloud,
+		emit: !(modules.GetModules().Features().Cloud || cloud),
 	}
 }
 

diff --git a/lib/service/service.go b/lib/service/service.go
@@ -1785,7 +1785,7 @@ func (process *TeleportProcess) initAuthService() error {
 	}
 
 	checkingEmitter, err := events.NewCheckingEmitter(events.CheckingEmitterConfig{
-		Inner:       events.NewMultiEmitter(events.NewLoggingEmitter(), emitter),
+		Inner:       events.NewMultiEmitter(events.NewLoggingEmitter(process.getClusterFeatures().Cloud), emitter),
 		Clock:       process.Clock,
 		ClusterName: clusterName,
 	})
@@ -2459,7 +2459,7 @@ func (process *TeleportProcess) proxyPublicAddr() utils.NetAddr {
 // It is caller's responsibility to call Close on the emitter once done.
 func (process *TeleportProcess) NewAsyncEmitter(clt apievents.Emitter) (*events.AsyncEmitter, error) {
 	emitter, err := events.NewCheckingEmitter(events.CheckingEmitterConfig{
-		Inner: events.NewMultiEmitter(events.NewLoggingEmitter(), clt),
+		Inner: events.NewMultiEmitter(events.NewLoggingEmitter(process.getClusterFeatures().Cloud), clt),
 		Clock: process.Clock,
 	})
 	if err != nil {