switch to go-kit logger

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
Jan-Otto Kröpke
2023-04-22 12:17:51 +02:00
parent e0e31254e2
commit 8509bc69a6
70 changed files with 1052 additions and 993 deletions

View File

@@ -4,7 +4,8 @@
package collector
import (
"github.com/prometheus-community/windows_exporter/log"
"github.com/go-kit/log"
"github.com/go-kit/log/level"
"github.com/prometheus/client_golang/prometheus"
"github.com/yusufpapurcu/wmi"
)
@@ -24,6 +25,8 @@ import (
// win32_PerfRawData_Counters_VMwareBlastWindowsMediaMMRCounters
type vmwareBlastCollector struct {
logger log.Logger
AudioReceivedBytes *prometheus.Desc
AudioReceivedPackets *prometheus.Desc
AudioTransmittedBytes *prometheus.Desc
@@ -107,9 +110,10 @@ type vmwareBlastCollector struct {
}
// newVmwareBlastCollector constructs a new vmwareBlastCollector
func newVmwareBlastCollector() (Collector, error) {
func newVmwareBlastCollector(logger log.Logger) (Collector, error) {
const subsystem = "vmware_blast"
return &vmwareBlastCollector{
logger: log.With(logger, "collector", subsystem),
AudioReceivedBytes: prometheus.NewDesc(
prometheus.BuildFQName(Namespace, subsystem, "audio_received_bytes_total"),
"(AudioReceivedBytes)",
@@ -542,51 +546,51 @@ func newVmwareBlastCollector() (Collector, error) {
// to the provided prometheus Metric channel.
func (c *vmwareBlastCollector) Collect(ctx *ScrapeContext, ch chan<- prometheus.Metric) error {
if desc, err := c.collectAudio(ch); err != nil {
log.Error("failed collecting vmware blast audio metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast audio metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectCdr(ch); err != nil {
log.Error("failed collecting vmware blast CDR metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast CDR metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectClipboard(ch); err != nil {
log.Error("failed collecting vmware blast clipboard metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast clipboard metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectHtml5Mmr(ch); err != nil {
log.Error("failed collecting vmware blast HTML5 MMR metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast HTML5 MMR metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectImaging(ch); err != nil {
log.Error("failed collecting vmware blast imaging metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast imaging metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectRtav(ch); err != nil {
log.Error("failed collecting vmware blast RTAV metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast RTAV metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectSerialPortandScanner(ch); err != nil {
log.Error("failed collecting vmware blast serial port and scanner metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast serial port and scanner metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectSession(ch); err != nil {
log.Error("failed collecting vmware blast metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectSkypeforBusinessControl(ch); err != nil {
log.Error("failed collecting vmware blast skype for business control metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast skype for business control metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectThinPrint(ch); err != nil {
log.Error("failed collecting vmware blast thin print metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast thin print metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectUsb(ch); err != nil {
log.Error("failed collecting vmware blast USB metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast USB metrics", "desc", desc, "err", err)
return err
}
if desc, err := c.collectWindowsMediaMmr(ch); err != nil {
log.Error("failed collecting vmware blast windows media MMR metrics:", desc, err)
level.Error(c.logger).Log("failed collecting vmware blast windows media MMR metrics", "desc", desc, "err", err)
return err
}
return nil
@@ -699,7 +703,7 @@ type win32_PerfRawData_Counters_VMwareBlastWindowsMediaMMRCounters struct {
func (c *vmwareBlastCollector) collectAudio(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastAudioCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -738,7 +742,7 @@ func (c *vmwareBlastCollector) collectAudio(ch chan<- prometheus.Metric) (*prome
func (c *vmwareBlastCollector) collectCdr(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastCDRCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -777,7 +781,7 @@ func (c *vmwareBlastCollector) collectCdr(ch chan<- prometheus.Metric) (*prometh
func (c *vmwareBlastCollector) collectClipboard(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastClipboardCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -816,7 +820,7 @@ func (c *vmwareBlastCollector) collectClipboard(ch chan<- prometheus.Metric) (*p
func (c *vmwareBlastCollector) collectHtml5Mmr(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastHTML5MMRcounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -855,7 +859,7 @@ func (c *vmwareBlastCollector) collectHtml5Mmr(ch chan<- prometheus.Metric) (*pr
func (c *vmwareBlastCollector) collectImaging(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastImagingCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -942,7 +946,7 @@ func (c *vmwareBlastCollector) collectImaging(ch chan<- prometheus.Metric) (*pro
func (c *vmwareBlastCollector) collectRtav(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastRTAVCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -981,7 +985,7 @@ func (c *vmwareBlastCollector) collectRtav(ch chan<- prometheus.Metric) (*promet
func (c *vmwareBlastCollector) collectSerialPortandScanner(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastSerialPortandScannerCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -1020,7 +1024,7 @@ func (c *vmwareBlastCollector) collectSerialPortandScanner(ch chan<- prometheus.
func (c *vmwareBlastCollector) collectSession(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastSessionCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -1137,7 +1141,7 @@ func (c *vmwareBlastCollector) collectSession(ch chan<- prometheus.Metric) (*pro
func (c *vmwareBlastCollector) collectSkypeforBusinessControl(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastSkypeforBusinessControlCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -1176,7 +1180,7 @@ func (c *vmwareBlastCollector) collectSkypeforBusinessControl(ch chan<- promethe
func (c *vmwareBlastCollector) collectThinPrint(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastThinPrintCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -1215,7 +1219,7 @@ func (c *vmwareBlastCollector) collectThinPrint(ch chan<- prometheus.Metric) (*p
func (c *vmwareBlastCollector) collectUsb(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastUSBCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}
@@ -1254,7 +1258,7 @@ func (c *vmwareBlastCollector) collectUsb(ch chan<- prometheus.Metric) (*prometh
func (c *vmwareBlastCollector) collectWindowsMediaMmr(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
var dst []win32_PerfRawData_Counters_VMwareBlastWindowsMediaMMRCounters
q := queryAll(&dst)
q := queryAll(&dst, c.logger)
if err := wmi.Query(q, &dst); err != nil {
return nil, err
}