Merge pull request #67 from Czyzmanski/fix-prometheus-client-cve

Bump github.com/prometheus/client_golang to 1.11.1 to fix CVEs / on behalf of sczyzmanski

go.mod

@@ -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
 )

metrics/prometheus.go

@@ -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"
 )
@@ -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.