feat: add line count to BrewScanResult and update scanning methods for metrics

Author: shubham-stepsecurity

internal/detector/brewscan.go

@@ -52,6 +52,7 @@ func (s *BrewScanner) ScanFormulae(ctx context.Context) (model.BrewScanResult, b
 		Error:           errMsg,
 		ExitCode:        exitCode,
 		ScanDurationMs:  duration,
+		LineCount:       lineCount,
 	}, true
 }
 
@@ -86,5 +87,6 @@ func (s *BrewScanner) ScanCasks(ctx context.Context) (model.BrewScanResult, bool
 		Error:           errMsg,
 		ExitCode:        exitCode,
 		ScanDurationMs:  duration,
+		LineCount:       lineCount,
 	}, true
 }

internal/detector/xcode_extensions_test.go

@@ -6,13 +6,13 @@ import (
 
 func TestParsePluginkitLine(t *testing.T) {
 	tests := []struct {
-		name      string
-		line      string
-		wantID    string
-		wantVer   string
-		wantPub   string
-		wantName  string
-		wantNil   bool
+		name     string
+		line     string
+		wantID   string
+		wantVer  string
+		wantPub  string
+		wantName string
+		wantNil  bool
 	}{
 		{
 			name:     "enabled extension",

internal/executor/mock.go

@@ -307,7 +307,14 @@ type mockDirEntry struct {
 	dir  bool
 }
 
-func (e *mockDirEntry) Name() string               { return e.name }
-func (e *mockDirEntry) IsDir() bool                { return e.dir }
-func (e *mockDirEntry) Type() os.FileMode          { if e.dir { return os.ModeDir }; return 0 }
-func (e *mockDirEntry) Info() (os.FileInfo, error)  { return &mockFileInfo{name: e.name, dir: e.dir}, nil }
+func (e *mockDirEntry) Name() string { return e.name }
+func (e *mockDirEntry) IsDir() bool  { return e.dir }
+func (e *mockDirEntry) Type() os.FileMode {
+	if e.dir {
+		return os.ModeDir
+	}
+	return 0
+}
+func (e *mockDirEntry) Info() (os.FileInfo, error) {
+	return &mockFileInfo{name: e.name, dir: e.dir}, nil
+}

internal/executor/user_aware.go

@@ -67,8 +67,8 @@ func (e *UserAwareExecutor) LookPath(name string) (string, error) {
 
 // --- Pass-through methods ---
 
-func (e *UserAwareExecutor) FileExists(path string) bool         { return e.inner.FileExists(path) }
-func (e *UserAwareExecutor) DirExists(path string) bool          { return e.inner.DirExists(path) }
+func (e *UserAwareExecutor) FileExists(path string) bool          { return e.inner.FileExists(path) }
+func (e *UserAwareExecutor) DirExists(path string) bool           { return e.inner.DirExists(path) }
 func (e *UserAwareExecutor) ReadFile(path string) ([]byte, error) { return e.inner.ReadFile(path) }
 func (e *UserAwareExecutor) ReadDir(path string) ([]os.DirEntry, error) {
 	return e.inner.ReadDir(path)

internal/model/model.go

@@ -141,6 +141,7 @@ type BrewScanResult struct {
 	Error           string `json:"error"`
 	ExitCode        int    `json:"exit_code"`
 	ScanDurationMs  int64  `json:"scan_duration_ms"`
+	LineCount       int    `json:"line_count"`
 }
 
 // PythonScanResult holds raw Python scan output for enterprise telemetry.

internal/telemetry/telemetry.go

@@ -374,10 +374,14 @@ func Run(exec executor.Executor, log *progress.Logger, cfg *cli.Config) error {
 		},
 
 		PerformanceMetrics: &PerformanceMetrics{
-			ExtensionsCount:     len(extensions),
-			NodePackagesScanMs:  nodeScanMs,
-			NodeGlobalPkgsCount: len(globalPkgs),
-			NodeProjectsCount:   len(nodeProjects),
+			ExtensionsCount:       len(extensions),
+			NodePackagesScanMs:    nodeScanMs,
+			NodeGlobalPkgsCount:   len(globalPkgs),
+			NodeProjectsCount:     len(nodeProjects),
+			BrewFormulaeCount:     brewFormulaeCount(brewScans),
+			BrewCasksCount:        brewCasksCount(brewScans),
+			PythonGlobalPkgsCount: len(pythonGlobalPkgs),
+			PythonProjectsCount:   len(pythonProjects),
 		},
 	}
 
@@ -392,6 +396,24 @@ func Run(exec executor.Executor, log *progress.Logger, cfg *cli.Config) error {
 	return nil
 }
 
+func brewFormulaeCount(scans []model.BrewScanResult) int {
+	for _, s := range scans {
+		if s.ScanType == "formulae" {
+			return s.LineCount
+		}
+	}
+	return 0
+}
+
+func brewCasksCount(scans []model.BrewScanResult) int {
+	for _, s := range scans {
+		if s.ScanType == "casks" {
+			return s.LineCount
+		}
+	}
+	return 0
+}
+
 func uploadToS3(ctx context.Context, log *progress.Logger, payload *Payload) error {
 	payloadJSON, err := json.Marshal(payload)
 	if err != nil {
@@ -473,11 +495,15 @@ func uploadToS3(ctx context.Context, log *progress.Logger, payload *Payload) err
 		// Log retry and backoff
 		backoff := time.Duration(attempt) * 2 * time.Second
 		if err != nil {
-			log.Progress("S3 upload attempt %d/%d failed (%s), retrying in %s...", attempt, maxRetries, elapsed, backoff)
+			log.Progress("S3 upload attempt %d/%d failed after %s: %v; retrying in %s...", attempt, maxRetries, elapsed, err, backoff)
 		} else {
 			log.Progress("S3 upload attempt %d/%d got status %d, retrying in %s...", attempt, maxRetries, putResp.StatusCode, backoff)
 		}
-		time.Sleep(backoff)
+		select {
+		case <-time.After(backoff):
+		case <-ctx.Done():
+			return ctx.Err()
+		}
 	}
 	defer func() { _ = putResp.Body.Close() }()
 	_, _ = io.Copy(io.Discard, putResp.Body)