Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/prometheus/client_golang to 1.11.1 to fix CVEs #67

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 12 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,21 @@ go 1.18

require (
github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01
github.com/prometheus/client_golang v0.0.0-20160627143620-9f1ed1ed4a5f
github.com/stretchr/testify v1.1.5-0.20160925220609-976c720a22c8
github.com/prometheus/client_golang v1.11.1
github.com/stretchr/testify v1.4.0
)

require (
github.com/beorn7/perks v0.0.0-20160229213445-3ac7bf7a47d1 // indirect
github.com/davecgh/go-spew v1.0.1-0.20160907170601-6d212800a42e // indirect
github.com/golang/protobuf v0.0.0-20160629211053-3852dcfda249 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.0.0-20150212101744-fa8ad6fec335 // indirect
github.com/prometheus/common v0.0.0-20160623151427-4402f4e5ea79 // indirect
github.com/prometheus/procfs v0.0.0-20160411190841-abf152e5f3e9 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
google.golang.org/protobuf v1.26.0-rc.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
)
157 changes: 141 additions & 16 deletions go.sum

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion metrics/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package metrics
import (
"github.com/box/kube-applier/run"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"net/http"
"strconv"
)
Expand All @@ -18,7 +19,7 @@ type Prometheus struct {

// GetHandler returns a handler for exposing Prometheus metrics via HTTP.
func (p *Prometheus) GetHandler() http.Handler {
return prometheus.UninstrumentedHandler()
return promhttp.Handler()
}

// Configure creates and registers the custom metrics for kube-applier, and starts a loop to receive run results.
Expand Down
36 changes: 30 additions & 6 deletions vendor/github.com/beorn7/perks/quantile/stream.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions vendor/github.com/cespare/xxhash/v2/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions vendor/github.com/cespare/xxhash/v2/LICENSE.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions vendor/github.com/cespare/xxhash/v2/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading