Merge pull request #1379 from DiniFarb/win_srv_stop_error_2

Update pkg/initiate/initiate.go
Co-authored-by: Jan-Otto Kröpke <github@jkroepke.de> Signed-off-by: DiniFarb <andreas.vogt89@bluewin.ch>
2026-02-08 22:16:38 +00:00 · 2024-01-09 12:46:39 +01:00 · 2024-01-09 12:40:01 +01:00 · 2024-01-09 09:02:13 +01:00 · 2024-01-08 21:23:35 +01:00 · 2024-01-08 19:26:04 +01:00
4 changed files with 11 additions and 8 deletions
--- a/exporter.go
+++ b/exporter.go
@@ -153,6 +153,11 @@ func main() {
 		_ = level.Error(logger).Log("msg", "Couldn't load collectors", "err", err)
 		os.Exit(1)
 	}
+	err = collectors.SetPerfCounterQuery()
+	if err != nil {
+		_ = level.Error(logger).Log("msg", "Couldn't set performance counter query", "err", err)
+		os.Exit(1)
+	}

 	if u, err := user.Current(); err != nil {
 		_ = level.Warn(logger).Log("msg", "Unable to determine which user is running this exporter. More info: https://github.com/golang/go/issues/37348")
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.3
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
-	golang.org/x/sys v0.15.0
+	golang.org/x/sys v0.16.0
 	gopkg.in/yaml.v3 v3.0.1
 )

--- a/go.sum
+++ b/go.sum
@@ -161,8 +161,8 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
--- a/pkg/initiate/initiate.go
+++ b/pkg/initiate/initiate.go
@@ -13,9 +13,7 @@ const (
 	serviceName = "windows_exporter"
 )

-type windowsExporterService struct {
-	stopCh chan<- bool
-}
+type windowsExporterService struct{}

 var logger *eventlog.Log

@@ -39,7 +37,6 @@ loop:
 			}
 		}
 	}
-	s.stopCh <- true
 	return
 }

@@ -63,10 +60,11 @@ func init() {
 		}
 		_ = logger.Info(100, "Attempting to start exporter service")
 		go func() {
-			err = svc.Run(serviceName, &windowsExporterService{stopCh: StopCh})
+			err = svc.Run(serviceName, &windowsExporterService{})
 			if err != nil {
 				_ = logger.Error(102, fmt.Sprintf("Failed to start service: %v", err))
 			}
+			StopCh <- true
 		}()
 	}
 }
Author	SHA1	Message	Date
Jan-Otto Kröpke	5398e91752	Merge pull request #1379 from DiniFarb/win_srv_stop_error_2	2024-01-09 12:46:39 +01:00
DiniFarb	3868c97686	Update pkg/initiate/initiate.go Co-authored-by: Jan-Otto Kröpke <github@jkroepke.de> Signed-off-by: DiniFarb <andreas.vogt89@bluewin.ch>	2024-01-09 12:40:01 +01:00
Jan-Otto Kröpke	856389e107	Merge pull request #1376 from mattdurham/master	2024-01-09 09:02:13 +01:00
Dinifarb	44f4918219	fix(#1352 ): moving the stop signal after svc.Run() Signed-off-by: Dinifarb <andreas.vogt89@bluewin.ch>	2024-01-08 21:23:35 +01:00
Jan-Otto Kröpke	971cab5184	Merge pull request #1375 from prometheus-community/dependabot/go_modules/golang.org/x/sys-0.16.0	2024-01-08 19:26:04 +01:00
matt durham	f850a84140	add call to set perf counter query Signed-off-by: matt durham <mattdurham@ppog.org>	2024-01-08 10:00:39 -05:00
dependabot[bot]	0be1708e06	chore(deps): bump golang.org/x/sys from 0.15.0 to 0.16.0 Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.15.0 to 0.16.0. - [Commits](https://github.com/golang/sys/compare/v0.15.0...v0.16.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-01-08 11:23:09 +00:00