Skip to content

Commit

Permalink
Revert "upgrade prometheus client_golang to v1.2.1" (cloudfoundry#557)
Browse files Browse the repository at this point in the history
* Revert "Merge pull request cloudfoundry#552 from qibobo/dev_qy_upgrade_prometheusgo"

This reverts commit 12d173b, reversing
changes made to bc8e77c.

* Revert "upgrade prometheus client_golang to v1.2.1"

This reverts commit 994eab5.
  • Loading branch information
aqan213 authored Feb 10, 2020
1 parent bfc7be9 commit c654d32
Show file tree
Hide file tree
Showing 9 changed files with 880 additions and 15 deletions.
5 changes: 1 addition & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,6 @@
[submodule "src/github.com/juju/ratelimit"]
path = src/github.com/juju/ratelimit
url = https://github.com/juju/ratelimit
[submodule "src/github.com/cespare/xxhash"]
path = src/github.com/cespare/xxhash
url = https://github.com/cespare/xxhash.git
[submodule "src/github.com/jmoiron/sqlx"]
path = src/github.com/jmoiron/sqlx
url = https://github.com/jmoiron/sqlx
url = https://github.com/jmoiron/sqlx
7 changes: 1 addition & 6 deletions src/autoscaler/healthendpoint/registrar.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ import (
func RegisterCollectors(registrar prometheus.Registerer, collectors []prometheus.Collector, includeDefault bool, logger lager.Logger) {

if includeDefault {
err := registrar.Register(prometheus.NewProcessCollector(prometheus.ProcessCollectorOpts{
PidFn: func() (int, error) {
return os.Getpid(), nil
},
Namespace: "",
}))
err := registrar.Register(prometheus.NewProcessCollector(os.Getpid(), ""))
if err != nil {
logger.Error("Failed to register process collector", err)
}
Expand Down
Loading

0 comments on commit c654d32

Please sign in to comment.