sendnrw/windows_exporter
2
0
Fork 0
mirror of https://github.com/prometheus-community/windows_exporter.git synced 2026-02-27 15:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: pass context aware logger to collectors (#1582)

Browse Source
This commit is contained in:
Jan-Otto Kröpke
2024-08-24 19:14:38 +02:00
committed by GitHub
parent fbead0fb79
commit 89c832feb0
65 changed files with 876 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
pkg/collector/vmware_blast/vmware_blast.go
View File

@@ -33,7 +33,6 @@ var ConfigDefaults = Config{}
type Collector struct {
config Config
logger log.Logger
audioReceivedBytes *prometheus.Desc
audioReceivedPackets *prometheus.Desc
@@ -117,7 +116,7 @@ type Collector struct {
windowsMediaMMRTransmittedPackets *prometheus.Desc
}
func New(logger log.Logger, config *Config) *Collector {
func New(config *Config) *Collector {
if config == nil {
config = &ConfigDefaults
}
@@ -126,8 +125,6 @@ func New(logger log.Logger, config *Config) *Collector {
config: *config,
}
c.SetLogger(logger)
return c
}
@@ -139,11 +136,7 @@ func (c *Collector) GetName() string {
return Name
}
func (c *Collector) SetLogger(logger log.Logger) {
c.logger = log.With(logger, "collector", Name)
}
func (c *Collector) GetPerfCounter() ([]string, error) {
func (c *Collector) GetPerfCounter(_ log.Logger) ([]string, error) {
return []string{}, nil
}
@@ -151,8 +144,9 @@ func (c *Collector) Close() error {
return nil
}
func (c *Collector) Build() error {
_ = level.Warn(c.logger).Log("msg", "vmware_blast collector is deprecated and will be removed in the future.")
func (c *Collector) Build(logger log.Logger) error {
_ = level.Warn(logger).
Log("msg", "vmware_blast collector is deprecated and will be removed in the future.", "collector", Name)
c.audioReceivedBytes = prometheus.NewDesc(
prometheus.BuildFQName(types.Namespace, Name, "audio_received_bytes_total"),
@@ -584,53 +578,54 @@ func (c *Collector) Build() error {
// Collect sends the metric values for each metric
// to the provided prometheus Metric channel.
func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
if err := c.collectAudio(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast audio metrics", "err", err)
func (c *Collector) Collect(_ *types.ScrapeContext, logger log.Logger, ch chan<- prometheus.Metric) error {
logger = log.With(logger, "collector", Name)
if err := c.collectAudio(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast audio metrics", "err", err)
return err
}
if err := c.collectCdr(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast CDR metrics", "err", err)
if err := c.collectCdr(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast CDR metrics", "err", err)
return err
}
if err := c.collectClipboard(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast clipboard metrics", "err", err)
if err := c.collectClipboard(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast clipboard metrics", "err", err)
return err
}
if err := c.collectHtml5Mmr(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast HTML5 MMR metrics", "err", err)
if err := c.collectHtml5Mmr(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast HTML5 MMR metrics", "err", err)
return err
}
if err := c.collectImaging(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast imaging metrics", "err", err)
if err := c.collectImaging(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast imaging metrics", "err", err)
return err
}
if err := c.collectRtav(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast RTAV metrics", "err", err)
if err := c.collectRtav(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast RTAV metrics", "err", err)
return err
}
if err := c.collectSerialPortandScanner(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast serial port and scanner metrics", "err", err)
if err := c.collectSerialPortandScanner(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast serial port and scanner metrics", "err", err)
return err
}
if err := c.collectSession(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast metrics", "err", err)
if err := c.collectSession(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast metrics", "err", err)
return err
}
if err := c.collectSkypeforBusinessControl(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast skype for business control metrics", "err", err)
if err := c.collectSkypeforBusinessControl(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast skype for business control metrics", "err", err)
return err
}
if err := c.collectThinPrint(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast thin print metrics", "err", err)
if err := c.collectThinPrint(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast thin print metrics", "err", err)
return err
}
if err := c.collectUsb(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast USB metrics", "err", err)
if err := c.collectUsb(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast USB metrics", "err", err)
return err
}
if err := c.collectWindowsMediaMmr(ch); err != nil {
_ = level.Error(c.logger).Log("msg", "failed collecting vmware blast windows media MMR metrics", "err", err)
if err := c.collectWindowsMediaMmr(logger, ch); err != nil {
_ = level.Error(logger).Log("msg", "failed collecting vmware blast windows media MMR metrics", "err", err)
return err
}
return nil
@@ -741,9 +736,9 @@ type win32_PerfRawData_Counters_VMwareBlastWindowsMediaMMRCounters struct {
TransmittedPackets uint32
}
func (c *Collector) collectAudio(ch chan<- prometheus.Metric) error {
func (c *Collector) collectAudio(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastAudioCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -780,9 +775,9 @@ func (c *Collector) collectAudio(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectCdr(ch chan<- prometheus.Metric) error {
func (c *Collector) collectCdr(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastCDRCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -819,9 +814,9 @@ func (c *Collector) collectCdr(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectClipboard(ch chan<- prometheus.Metric) error {
func (c *Collector) collectClipboard(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastClipboardCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -858,9 +853,9 @@ func (c *Collector) collectClipboard(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectHtml5Mmr(ch chan<- prometheus.Metric) error {
func (c *Collector) collectHtml5Mmr(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastHTML5MMRcounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -897,9 +892,9 @@ func (c *Collector) collectHtml5Mmr(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectImaging(ch chan<- prometheus.Metric) error {
func (c *Collector) collectImaging(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastImagingCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -984,9 +979,9 @@ func (c *Collector) collectImaging(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectRtav(ch chan<- prometheus.Metric) error {
func (c *Collector) collectRtav(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastRTAVCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -1023,9 +1018,9 @@ func (c *Collector) collectRtav(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectSerialPortandScanner(ch chan<- prometheus.Metric) error {
func (c *Collector) collectSerialPortandScanner(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastSerialPortandScannerCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -1062,9 +1057,9 @@ func (c *Collector) collectSerialPortandScanner(ch chan<- prometheus.Metric) err
return nil
}
func (c *Collector) collectSession(ch chan<- prometheus.Metric) error {
func (c *Collector) collectSession(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastSessionCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -1179,9 +1174,9 @@ func (c *Collector) collectSession(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectSkypeforBusinessControl(ch chan<- prometheus.Metric) error {
func (c *Collector) collectSkypeforBusinessControl(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastSkypeforBusinessControlCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -1218,9 +1213,9 @@ func (c *Collector) collectSkypeforBusinessControl(ch chan<- prometheus.Metric)
return nil
}
func (c *Collector) collectThinPrint(ch chan<- prometheus.Metric) error {
func (c *Collector) collectThinPrint(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastThinPrintCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -1257,9 +1252,9 @@ func (c *Collector) collectThinPrint(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectUsb(ch chan<- prometheus.Metric) error {
func (c *Collector) collectUsb(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastUSBCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}
@@ -1296,9 +1291,9 @@ func (c *Collector) collectUsb(ch chan<- prometheus.Metric) error {
return nil
}
func (c *Collector) collectWindowsMediaMmr(ch chan<- prometheus.Metric) error {
func (c *Collector) collectWindowsMediaMmr(logger log.Logger, ch chan<- prometheus.Metric) error {
var dst []win32_PerfRawData_Counters_VMwareBlastWindowsMediaMMRCounters
q := wmi.QueryAll(&dst, c.logger)
q := wmi.QueryAll(&dst, logger)
if err := wmi.Query(q, &dst); err != nil {
return err
}