diff --git a/internal/collector/memory/memory.go b/internal/collector/memory/memory.go index eea64fd27..12bb2cac7 100644 --- a/internal/collector/memory/memory.go +++ b/internal/collector/memory/memory.go @@ -90,10 +90,6 @@ func (c *Collector) GetName() string { return Name } -func (c *Collector) GetPerfCounter(_ *slog.Logger) ([]string, error) { - return []string{}, nil -} - func (c *Collector) Close() error { return nil } diff --git a/internal/collector/mscluster/mscluster.go b/internal/collector/mscluster/mscluster.go index e531ee54d..ebc3cad35 100644 --- a/internal/collector/mscluster/mscluster.go +++ b/internal/collector/mscluster/mscluster.go @@ -84,10 +84,6 @@ func (c *Collector) GetName() string { return Name } -func (c *Collector) GetPerfCounter(_ *slog.Logger) ([]string, error) { - return []string{"Memory"}, nil -} - func (c *Collector) Close() error { return nil } diff --git a/internal/collector/smtp/smtp.go b/internal/collector/smtp/smtp.go index bdddfeb6c..5ac132e8f 100644 --- a/internal/collector/smtp/smtp.go +++ b/internal/collector/smtp/smtp.go @@ -135,10 +135,6 @@ func (c *Collector) GetName() string { return Name } -func (c *Collector) GetPerfCounter(_ *slog.Logger) ([]string, error) { - return []string{"SMTP Server"}, nil -} - func (c *Collector) Close() error { c.perfDataCollector.Close() diff --git a/pkg/collector/prometheus.go b/pkg/collector/prometheus.go index ff5abbc92..169ce7fa7 100644 --- a/pkg/collector/prometheus.go +++ b/pkg/collector/prometheus.go @@ -29,7 +29,6 @@ type Prometheus struct { collectorScrapeDurationDesc *prometheus.Desc collectorScrapeSuccessDesc *prometheus.Desc collectorScrapeTimeoutDesc *prometheus.Desc - snapshotDuration *prometheus.Desc } type collectorStatus struct { @@ -76,12 +75,6 @@ func (c *MetricCollectors) NewPrometheusCollector(timeout time.Duration, logger []string{"collector"}, nil, ), - snapshotDuration: prometheus.NewDesc( - prometheus.BuildFQName(types.Namespace, "exporter", "perflib_snapshot_duration_seconds"), - "Duration of perflib snapshot capture", - nil, - nil, - ), } } @@ -90,13 +83,7 @@ func (p *Prometheus) Describe(_ chan<- *prometheus.Desc) {} // Collect sends the collected metrics from each of the MetricCollectors to // prometheus. func (p *Prometheus) Collect(ch chan<- prometheus.Metric) { - t := time.Now() - - ch <- prometheus.MustNewConstMetric( - p.snapshotDuration, - prometheus.GaugeValue, - time.Since(t).Seconds(), - ) + collectorStartTime := time.Now() // WaitGroup to wait for all collectors to finish wg := sync.WaitGroup{} @@ -153,7 +140,7 @@ func (p *Prometheus) Collect(ch chan<- prometheus.Metric) { ch <- prometheus.MustNewConstMetric( p.scrapeDurationDesc, prometheus.GaugeValue, - time.Since(t).Seconds(), + time.Since(collectorStartTime).Seconds(), ) } diff --git a/tools/e2e-output.txt b/tools/e2e-output.txt index a66326c96..7322f50a8 100644 --- a/tools/e2e-output.txt +++ b/tools/e2e-output.txt @@ -157,8 +157,6 @@ windows_exporter_collector_timeout{collector="tcp"} 0 windows_exporter_collector_timeout{collector="textfile"} 0 windows_exporter_collector_timeout{collector="time"} 0 windows_exporter_collector_timeout{collector="udp"} 0 -# HELP windows_exporter_perflib_snapshot_duration_seconds Duration of perflib snapshot capture -# TYPE windows_exporter_perflib_snapshot_duration_seconds gauge # HELP windows_exporter_scrape_duration_seconds windows_exporter: Total scrape duration. # TYPE windows_exporter_scrape_duration_seconds gauge # HELP windows_logical_disk_avg_read_requests_queued Average number of read requests that were queued for the selected disk during the sample interval (LogicalDisk.AvgDiskReadQueueLength) diff --git a/tools/end-to-end-test.ps1 b/tools/end-to-end-test.ps1 index 2a5976ef0..e4d05fb07 100644 --- a/tools/end-to-end-test.ps1 +++ b/tools/end-to-end-test.ps1 @@ -18,7 +18,7 @@ mkdir $textfile_dir | Out-Null Copy-Item 'e2e-textfile.prom' -Destination "$($textfile_dir)/e2e-textfile.prom" # Omit dynamic collector information that will change after each run -$skip_re = "^(go_|windows_exporter_build_info|windows_exporter_collector_duration_seconds|windows_exporter_perflib_snapshot_duration_seconds|windows_exporter_scrape_duration_seconds|process_|windows_textfile_mtime_seconds|windows_cpu|windows_cs|windows_cache|windows_logon|windows_pagefile|windows_logical_disk|windows_physical_disk|windows_memory|windows_net|windows_os|windows_process|windows_service_process|windows_printer|windows_udp|windows_tcp|windows_system|windows_time|windows_session|windows_perfdata|windows_textfile_mtime_seconds)" +$skip_re = "^(go_|windows_exporter_build_info|windows_exporter_collector_duration_seconds|windows_exporter_scrape_duration_seconds|process_|windows_textfile_mtime_seconds|windows_cpu|windows_cs|windows_cache|windows_logon|windows_pagefile|windows_logical_disk|windows_physical_disk|windows_memory|windows_net|windows_os|windows_process|windows_service_process|windows_printer|windows_udp|windows_tcp|windows_system|windows_time|windows_session|windows_perfdata|windows_textfile_mtime_seconds)" # Start process in background, awaiting HTTP requests. # Use default collectors, port and address: http://localhost:9182/metrics