Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: handled empty scanner and export false case for vscan #3502

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

fix: handled empty scanner and export false case for vscan #3502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion cmd/collectors/commonutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,11 +346,14 @@ func AggregatePerScanner(logger *slog.Logger, data *matrix.Matrix, latencyKey st
continue
}
scanner := i.GetLabel("scanner")
// scanner is key for cache matrix, skip when the scanner would be empty
if scanner == "" {
continue
}
if cache.GetInstance(scanner) == nil {
s, _ := cache.NewInstance(scanner)
s.SetLabel("scanner", scanner)
}
i.SetExportable(false)
}

// aggregate per scanner
Expand All @@ -360,7 +363,12 @@ func AggregatePerScanner(logger *slog.Logger, data *matrix.Matrix, latencyKey st
if !i.IsExportable() {
continue
}
i.SetExportable(false)
scanner := i.GetLabel("scanner")
// scanner is key for cache matrix, skip when the scanner would be empty
if scanner == "" {
continue
}
ps := cache.GetInstance(scanner)
if ps == nil {
logger.Error("Failed to find scanner instance in cache", slog.String("scanner", scanner))
Expand Down
Loading