Skip to content

fix(collector/pcidevice): Add nil checks to prevent panic #3421

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −10
Open

fix(collector/pcidevice): Add nil checks to prevent panic #3421

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
29 changes: 19 additions & 10 deletions collector/pcidevice_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,26 @@ func (c *pcideviceCollector) Update(ch chan<- prometheus.Metric) error {
ch <- c.infoDesc.mustNewConstMetric(1.0, values...)

// MaxLinkSpeed and CurrentLinkSpeed are represnted in GT/s
maxLinkSpeedTS := float64(int64(*device.MaxLinkSpeed * 1e9))
currentLinkSpeedTS := float64(int64(*device.CurrentLinkSpeed * 1e9))

for i, val := range []float64{
maxLinkSpeedTS,
float64(*device.MaxLinkWidth),
currentLinkSpeedTS,
float64(*device.CurrentLinkWidth),
} {
ch <- c.descs[i].mustNewConstMetric(val, device.Location.Strings()...)
var maxLinkSpeedTS, currentLinkSpeedTS float64
var maxLinkWidth, currentLinkWidth float64

if device.MaxLinkSpeed != nil {
maxLinkSpeedTS = float64(int64(*device.MaxLinkSpeed * 1e9))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will emit a 0 for metrics we don't know the value for.

I think we should do something like this:

Suggested change
maxLinkSpeedTS = float64(int64(*device.MaxLinkSpeed * 1e9))
ch <- c.descs[0].mustNewConstMetric(maxLinkSpeedTS, device.Location.Strings()...)

}
if device.CurrentLinkSpeed != nil {
currentLinkSpeedTS = float64(int64(*device.CurrentLinkSpeed * 1e9))
}
if device.MaxLinkWidth != nil {
maxLinkWidth = float64(*device.MaxLinkWidth)
}
if device.CurrentLinkWidth != nil {
currentLinkWidth = float64(*device.CurrentLinkWidth)
}

ch <- c.descs[0].mustNewConstMetric(maxLinkSpeedTS, device.Location.Strings()...)
ch <- c.descs[1].mustNewConstMetric(maxLinkWidth, device.Location.Strings()...)
ch <- c.descs[2].mustNewConstMetric(currentLinkSpeedTS, device.Location.Strings()...)
ch <- c.descs[3].mustNewConstMetric(currentLinkWidth, device.Location.Strings()...)
}

return nil
Expand Down