Renaming and metric removal

Author: kylos101

components/ee/agent-smith/pkg/agent/agent.go

@@ -142,7 +142,7 @@ func NewAgentSmith(cfg config.Config) (*Smith, error) {
 	var filesystemClass classifier.FileClassifier
 	if cfg.FilesystemScanning != nil && cfg.FilesystemScanning.Enabled {
 		// Create filesystem detector config
-		fsConfig := detector.FilesystemScanningConfig{
+		fsConfig := detector.FileScanningConfig{
 			Enabled:      cfg.FilesystemScanning.Enabled,
 			ScanInterval: cfg.FilesystemScanning.ScanInterval.Duration,
 			MaxFileSize:  cfg.FilesystemScanning.MaxFileSize,
@@ -257,7 +257,7 @@ type classifiedProcess struct {
 	Err error
 }
 
-type classifiedFilesystemFile struct {
+type classifiedFile struct {
 	F   detector.File
 	C   *classifier.Classification
 	Err error
@@ -284,7 +284,7 @@ func (agent *Smith) Start(ctx context.Context, callback func(InfringingWorkspace
 		cli = make(chan detector.Process, 500)
 		clo = make(chan classifiedProcess, 50)
 		fli = make(chan detector.File, 100)
-		flo = make(chan classifiedFilesystemFile, 25)
+		flo = make(chan classifiedFile, 25)
 	)
 	agent.metrics.RegisterClassificationQueues(cli, clo)
 
@@ -322,15 +322,13 @@ func (agent *Smith) Start(ctx context.Context, callback func(InfringingWorkspace
 			go func() {
 				defer wg.Done()
 				for file := range fli {
-					log.Infof("Classifying filesystem file: %s", file.Path)
 					class, err := agent.fileClassifier.MatchesFile(file.Path)
-					// Early out for no matches
 					if err == nil && class.Level == classifier.LevelNoMatch {
 						log.Infof("File classification: no match - %s", file.Path)
 						continue
 					}
 					log.Infof("File classification result: %s (level: %s, err: %v)", file.Path, class.Level, err)
-					flo <- classifiedFilesystemFile{F: file, C: class, Err: err}
+					flo <- classifiedFile{F: file, C: class, Err: err}
 				}
 			}()
 		}

components/ee/agent-smith/pkg/detector/filesystem.go

@@ -16,7 +16,6 @@ import (
 	"github.com/gitpod-io/gitpod/agent-smith/pkg/classifier"
 	"github.com/gitpod-io/gitpod/agent-smith/pkg/common"
 	"github.com/gitpod-io/gitpod/common-go/log"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 // FileDetector discovers suspicious files on the node
@@ -39,21 +38,15 @@ type fileDetector struct {
 	mu sync.RWMutex
 	fs chan File
 
-	config       FilesystemScanningConfig
+	config       FileScanningConfig
 	classifier   classifier.FileClassifier
 	lastScanTime time.Time
 
-	// Metrics
-	filesScannedTotal   prometheus.Counter
-	filesFoundTotal     prometheus.Counter
-	scanDurationSeconds prometheus.Histogram
-	droppedFilesTotal   prometheus.Counter
-
 	startOnce sync.Once
 }
 
-// FilesystemScanningConfig holds configuration for filesystem scanning
-type FilesystemScanningConfig struct {
+// FileScanningConfig holds configuration for file scanning
+type FileScanningConfig struct {
 	Enabled      bool
 	ScanInterval time.Duration
 	MaxFileSize  int64
@@ -62,10 +55,10 @@ type FilesystemScanningConfig struct {
 
 var _ FileDetector = &fileDetector{}
 
-// NewfileDetector creates a new filesystem detector
-func NewfileDetector(config FilesystemScanningConfig, fsClassifier classifier.FileClassifier) (*fileDetector, error) {
+// NewfileDetector creates a new file detector
+func NewfileDetector(config FileScanningConfig, fsClassifier classifier.FileClassifier) (*fileDetector, error) {
 	if !config.Enabled {
-		return nil, fmt.Errorf("filesystem scanning is disabled")
+		return nil, fmt.Errorf("file scanning is disabled")
 	}
 
 	// Set defaults
@@ -83,47 +76,9 @@ func NewfileDetector(config FilesystemScanningConfig, fsClassifier classifier.Fi
 		config:       config,
 		classifier:   fsClassifier,
 		lastScanTime: time.Time{}, // Zero time means never scanned
-		filesScannedTotal: prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: "gitpod",
-			Subsystem: "agent_smith_filesystem_detector",
-			Name:      "files_scanned_total",
-			Help:      "total number of files scanned for signatures",
-		}),
-		filesFoundTotal: prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: "gitpod",
-			Subsystem: "agent_smith_filesystem_detector",
-			Name:      "files_found_total",
-			Help:      "total number of files found for signature matching",
-		}),
-		scanDurationSeconds: prometheus.NewHistogram(prometheus.HistogramOpts{
-			Namespace: "gitpod",
-			Subsystem: "agent_smith_filesystem_detector",
-			Name:      "scan_duration_seconds",
-			Help:      "time taken to scan workspace filesystems",
-		}),
-		droppedFilesTotal: prometheus.NewCounter(prometheus.CounterOpts{
-			Namespace: "gitpod",
-			Subsystem: "agent_smith_filesystem_detector",
-			Name:      "dropped_files_total",
-			Help:      "total number of files dropped due to backpressure",
-		}),
 	}, nil
 }
 
-func (det *fileDetector) Describe(d chan<- *prometheus.Desc) {
-	det.filesScannedTotal.Describe(d)
-	det.filesFoundTotal.Describe(d)
-	det.scanDurationSeconds.Describe(d)
-	det.droppedFilesTotal.Describe(d)
-}
-
-func (det *fileDetector) Collect(m chan<- prometheus.Metric) {
-	det.filesScannedTotal.Collect(m)
-	det.filesFoundTotal.Collect(m)
-	det.scanDurationSeconds.Collect(m)
-	det.droppedFilesTotal.Collect(m)
-}
-
 func (det *fileDetector) start(ctx context.Context) {
 	fs := make(chan File, 100)
 	go func() {
@@ -159,11 +114,6 @@ func (det *fileDetector) start(ctx context.Context) {
 }
 
 func (det *fileDetector) scanWorkspaces(files chan<- File) {
-	start := time.Now()
-	defer func() {
-		det.scanDurationSeconds.Observe(time.Since(start).Seconds())
-	}()
-
 	// Get filesystem signatures to know what files to look for
 	filesystemSignatures := det.GetFileSignatures()
 	if len(filesystemSignatures) == 0 {
@@ -263,9 +213,6 @@ func (det *fileDetector) scanWorkspaceDirectory(wsDir WorkspaceDirectory, signat
 					continue
 				}
 
-				det.filesScannedTotal.Inc()
-				det.filesFoundTotal.Inc()
-
 				file := File{
 					Path:      filePath,
 					Workspace: workspace,
@@ -280,7 +227,6 @@ func (det *fileDetector) scanWorkspaceDirectory(wsDir WorkspaceDirectory, signat
 				case files <- file:
 					log.Infof("File sent to channel: %s", filePath)
 				default:
-					det.droppedFilesTotal.Inc()
 					log.Warnf("File dropped (channel full): %s", filePath)
 				}
 			}

components/ee/agent-smith/pkg/detector/filesystem_test.go

@@ -31,16 +31,16 @@ func (m *mockFileClassifier) Collect(m2 chan<- prometheus.Metric) {}
 func TestFileDetector_Config_Defaults(t *testing.T) {
 	tests := []struct {
 		name           string
-		inputConfig    FilesystemScanningConfig
-		expectedConfig FilesystemScanningConfig
+		inputConfig    FileScanningConfig
+		expectedConfig FileScanningConfig
 	}{
 		{
 			name: "all defaults",
-			inputConfig: FilesystemScanningConfig{
+			inputConfig: FileScanningConfig{
 				Enabled:     true,
 				WorkingArea: "/tmp/test-workspaces",
 			},
-			expectedConfig: FilesystemScanningConfig{
+			expectedConfig: FileScanningConfig{
 				Enabled:      true,
 				ScanInterval: 5 * time.Minute,
 				MaxFileSize:  1024,
@@ -49,13 +49,13 @@ func TestFileDetector_Config_Defaults(t *testing.T) {
 		},
 		{
 			name: "partial config",
-			inputConfig: FilesystemScanningConfig{
+			inputConfig: FileScanningConfig{
 				Enabled:      true,
 				ScanInterval: 10 * time.Minute,
 				MaxFileSize:  2048,
 				WorkingArea:  "/tmp/test-workspaces",
 			},
-			expectedConfig: FilesystemScanningConfig{
+			expectedConfig: FileScanningConfig{
 				Enabled:      true,
 				ScanInterval: 10 * time.Minute,
 				MaxFileSize:  2048,
@@ -64,13 +64,13 @@ func TestFileDetector_Config_Defaults(t *testing.T) {
 		},
 		{
 			name: "all custom values",
-			inputConfig: FilesystemScanningConfig{
+			inputConfig: FileScanningConfig{
 				Enabled:      true,
 				ScanInterval: 2 * time.Minute,
 				MaxFileSize:  512,
 				WorkingArea:  "/tmp/test-workspaces",
 			},
-			expectedConfig: FilesystemScanningConfig{
+			expectedConfig: FileScanningConfig{
 				Enabled:      true,
 				ScanInterval: 2 * time.Minute,
 				MaxFileSize:  512,
@@ -101,7 +101,7 @@ func TestFileDetector_Config_Defaults(t *testing.T) {
 }
 
 func TestFileDetector_DisabledConfig(t *testing.T) {
-	config := FilesystemScanningConfig{
+	config := FileScanningConfig{
 		Enabled: false,
 	}
 
@@ -159,7 +159,7 @@ func TestDiscoverWorkspaceDirectories(t *testing.T) {
 	}
 
 	// Create detector with temp working area
-	config := FilesystemScanningConfig{
+	config := FileScanningConfig{
 		Enabled:     true,
 		WorkingArea: tempDir,
 	}
@@ -235,7 +235,7 @@ func TestFindMatchingFiles(t *testing.T) {
 	}
 
 	// Create detector
-	config := FilesystemScanningConfig{
+	config := FileScanningConfig{
 		Enabled:     true,
 		WorkingArea: "/tmp", // Not used in this test
 	}
@@ -325,7 +325,7 @@ func TestFileDetector_GetFileSignatures(t *testing.T) {
 		},
 	}
 
-	config := FilesystemScanningConfig{
+	config := FileScanningConfig{
 		Enabled:     true,
 		WorkingArea: "/tmp",
 	}