Skip to content

Commit

Permalink
Silence missing netclass errors
Browse files Browse the repository at this point in the history
* Handle no such file and permission denied errors.
* Reduce excessive error wrapping.

Fixes: #1840

Signed-off-by: Ben Kochie <superq@gmail.com>
  • Loading branch information
SuperQ committed Mar 5, 2021
1 parent 57d572e commit 3c73a86
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

* [BUGFIX] Handle errors from disabled PSI subsystem #1983
* [BUGFIX] Sanitize strings from /sys/class/power_supply #1984
* [BUGFIX] Silence missing netclass errors #1986

## 1.1.1 / 2021-02-12

Expand Down
10 changes: 8 additions & 2 deletions collector/netclass_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
package collector

import (
"errors"
"fmt"
"os"
"regexp"

"github.com/go-kit/kit/log"
"github.com/go-kit/kit/log/level"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/procfs/sysfs"
"gopkg.in/alecthomas/kingpin.v2"
Expand Down Expand Up @@ -61,6 +64,10 @@ func NewNetClassCollector(logger log.Logger) (Collector, error) {
func (c *netClassCollector) Update(ch chan<- prometheus.Metric) error {
netClass, err := c.getNetClassInfo()
if err != nil {
if errors.Is(err, os.ErrNotExist) || errors.Is(err, os.ErrPermission) {
level.Debug(c.logger).Log("msg", "Could not read netclass file", "err", err)
return ErrNoData
}
return fmt.Errorf("could not get net class info: %w", err)
}
for _, ifaceInfo := range netClass {
Expand Down Expand Up @@ -173,9 +180,8 @@ func pushMetric(ch chan<- prometheus.Metric, subsystem string, name string, valu

func (c *netClassCollector) getNetClassInfo() (sysfs.NetClass, error) {
netClass, err := c.fs.NetClass()

if err != nil {
return netClass, fmt.Errorf("error obtaining net class info: %w", err)
return netClass, err
}

for device := range netClass {
Expand Down

0 comments on commit 3c73a86

Please sign in to comment.