Skip to content

Commit

Permalink
Upgrade exporter-toolkit to v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
marctc committed Jul 5, 2023
1 parent e49de80 commit f1c1ce9
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 54 deletions.
8 changes: 5 additions & 3 deletions exporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -357,11 +357,13 @@ func (e *Exporter) Run() {
})

server := &http.Server{
Addr: e.webListenAddress,
Handler: mux,
}

if err := web.ListenAndServe(server, e.opts.TLSConfigPath, promlog.New(&promlog.Config{})); err != nil {
flags := &web.FlagConfig{

Check failure on line 362 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, mongo:4.2, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 WebSystemdSocket is missing in FlagConfig (exhaustruct) Raw Output: exporter/exporter.go:362:12: WebSystemdSocket is missing in FlagConfig (exhaustruct) flags := &web.FlagConfig{ ^

Check failure on line 362 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, mongo:4.4, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 WebSystemdSocket is missing in FlagConfig (exhaustruct) Raw Output: exporter/exporter.go:362:12: WebSystemdSocket is missing in FlagConfig (exhaustruct) flags := &web.FlagConfig{ ^

Check failure on line 362 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, mongo:5.0, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 WebSystemdSocket is missing in FlagConfig (exhaustruct) Raw Output: exporter/exporter.go:362:12: WebSystemdSocket is missing in FlagConfig (exhaustruct) flags := &web.FlagConfig{ ^

Check failure on line 362 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, percona/percona-server-mongodb:4.2, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 WebSystemdSocket is missing in FlagConfig (exhaustruct) Raw Output: exporter/exporter.go:362:12: WebSystemdSocket is missing in FlagConfig (exhaustruct) flags := &web.FlagConfig{ ^

Check failure on line 362 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, percona/percona-server-mongodb:4.4, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 WebSystemdSocket is missing in FlagConfig (exhaustruct) Raw Output: exporter/exporter.go:362:12: WebSystemdSocket is missing in FlagConfig (exhaustruct) flags := &web.FlagConfig{ ^

Check failure on line 362 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, percona/percona-server-mongodb:5.0, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 WebSystemdSocket is missing in FlagConfig (exhaustruct) Raw Output: exporter/exporter.go:362:12: WebSystemdSocket is missing in FlagConfig (exhaustruct) flags := &web.FlagConfig{ ^

Check failure on line 362 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (tip, mongo:4.4, ubuntu-latest, true)

[golangci-lint] reported by reviewdog 🐶 WebSystemdSocket is missing in FlagConfig (exhaustruct) Raw Output: exporter/exporter.go:362:12: WebSystemdSocket is missing in FlagConfig (exhaustruct) flags := &web.FlagConfig{ ^
WebListenAddresses: &[]string{e.webListenAddress},
WebConfigFile: &e.opts.TLSConfigPath,
}
if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil {

Check failure on line 366 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, mongo:4.2, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 Level, Format are missing in Config (exhaustruct) Raw Output: exporter/exporter.go:366:59: Level, Format are missing in Config (exhaustruct) if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil { ^

Check failure on line 366 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, mongo:4.4, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 Level, Format are missing in Config (exhaustruct) Raw Output: exporter/exporter.go:366:59: Level, Format are missing in Config (exhaustruct) if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil { ^

Check failure on line 366 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, mongo:5.0, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 Level, Format are missing in Config (exhaustruct) Raw Output: exporter/exporter.go:366:59: Level, Format are missing in Config (exhaustruct) if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil { ^

Check failure on line 366 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, percona/percona-server-mongodb:4.2, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 Level, Format are missing in Config (exhaustruct) Raw Output: exporter/exporter.go:366:59: Level, Format are missing in Config (exhaustruct) if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil { ^

Check failure on line 366 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, percona/percona-server-mongodb:4.4, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 Level, Format are missing in Config (exhaustruct) Raw Output: exporter/exporter.go:366:59: Level, Format are missing in Config (exhaustruct) if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil { ^

Check failure on line 366 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (1.19.x, percona/percona-server-mongodb:5.0, ubuntu-latest, false)

[golangci-lint] reported by reviewdog 🐶 Level, Format are missing in Config (exhaustruct) Raw Output: exporter/exporter.go:366:59: Level, Format are missing in Config (exhaustruct) if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil { ^

Check failure on line 366 in exporter/exporter.go

View workflow job for this annotation

GitHub Actions / Build (tip, mongo:4.4, ubuntu-latest, true)

[golangci-lint] reported by reviewdog 🐶 Level, Format are missing in Config (exhaustruct) Raw Output: exporter/exporter.go:366:59: Level, Format are missing in Config (exhaustruct) if err := web.ListenAndServe(server, flags, promlog.New(&promlog.Config{})); err != nil { ^
e.logger.Errorf("error starting server: %v", err)
os.Exit(1)
}
Expand Down
16 changes: 9 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ require (
github.com/golang/snappy v0.0.3 // indirect
github.com/percona/exporter_shared v0.7.4-0.20211108113423-8555cdbac68b
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.2
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
github.com/prometheus/common v0.37.1
github.com/prometheus/exporter-toolkit v0.7.2
github.com/prometheus/common v0.42.0
github.com/prometheus/exporter-toolkit v0.10.0
github.com/sirupsen/logrus v1.9.3
github.com/stretchr/testify v1.8.2
go.mongodb.org/mongo-driver v1.11.7
Expand All @@ -20,6 +20,7 @@ require (
require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
Expand All @@ -32,16 +33,17 @@ require (
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1 // indirect
github.com/xdg-go/stringprep v1.0.3 // indirect
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/crypto v0.8.0 // indirect
golang.org/x/net v0.9.0 // indirect
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit f1c1ce9

Please sign in to comment.