From e589366d0686efe44fa68e005a9df6217077430a Mon Sep 17 00:00:00 2001 From: Andrew Lytvynov Date: Tue, 1 Sep 2020 13:17:09 -0700 Subject: [PATCH] Always collect metrics about top backend requests Previously, it was only done in debug mode. This makes some tabs in `tctl top` empty, when auth server is not in debug mode. --- lib/backend/report.go | 6 ------ lib/service/service.go | 10 ++++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lib/backend/report.go b/lib/backend/report.go index c66f5634fa0c4..47934b5b5bd1f 100644 --- a/lib/backend/report.go +++ b/lib/backend/report.go @@ -33,9 +33,6 @@ import ( type ReporterConfig struct { // Backend is a backend to wrap Backend Backend - // TrackTopRequests turns on tracking of top - // requests on - TrackTopRequests bool // Component is a component name to report Component string } @@ -221,9 +218,6 @@ func (s *Reporter) Migrate(ctx context.Context) error { return s.Backend.Migrate // trackRequests tracks top requests, endKey is supplied for ranges func (s *Reporter) trackRequest(opType OpType, key []byte, endKey []byte) { - if !s.TrackTopRequests { - return - } if len(key) == 0 { return } diff --git a/lib/service/service.go b/lib/service/service.go index af803021428e0..18961816648c0 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -1320,9 +1320,8 @@ func (process *TeleportProcess) newAccessCache(cfg accessCacheConfig) (*cache.Ca cacheBackend = liteBackend } reporter, err := backend.NewReporter(backend.ReporterConfig{ - Component: teleport.ComponentCache, - Backend: cacheBackend, - TrackTopRequests: process.Config.Debug, + Component: teleport.ComponentCache, + Backend: cacheBackend, }) if err != nil { return nil, trace.Wrap(err) @@ -2392,9 +2391,8 @@ func (process *TeleportProcess) initAuthStorage() (bk backend.Backend, err error return nil, trace.Wrap(err) } reporter, err := backend.NewReporter(backend.ReporterConfig{ - Component: teleport.ComponentBackend, - Backend: backend.NewSanitizer(bk), - TrackTopRequests: process.Config.Debug, + Component: teleport.ComponentBackend, + Backend: backend.NewSanitizer(bk), }) if err != nil { return nil, trace.Wrap(err)