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

gocollector: Reverted client_golang v1.12 addition of runtime/metrics metrics by default #1033

Merged
merged 1 commit into from Apr 13, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,8 @@
## Unreleased

* [CHANGE] Minimum required Go version is now 1.16.
* [CHANGE] Added `collectors.WithGoCollections` that allows to choose what collection of Go runtime metrics user wants: Equivalent of [`MemStats` structure](https://pkg.go.dev/runtime#MemStats) configured using `GoRuntimeMemStatsCollection`, new based on dedicated [runtime/metrics](https://pkg.go.dev/runtime/metrics) metrics represented by `GoRuntimeMetricsCollection` option, or both by specifying `GoRuntimeMemStatsCollection | GoRuntimeMetricsCollection` flag.
* [CHANGE] :warning: Change in `collectors.NewGoCollector` metrics: Reverting addition of new ~80 runtime metrics by default. You can enable this back with `GoRuntimeMetricsCollection` option or `GoRuntimeMemStatsCollection | GoRuntimeMetricsCollection` for smooth transition.

## 1.12.1 / 2022-01-29

Expand Down
4 changes: 2 additions & 2 deletions prometheus/collectors/go_collector_latest.go
Expand Up @@ -70,8 +70,8 @@ const (
// WithGoCollections(GoRuntimeMemStatsCollection | GoRuntimeMetricsCollection) means both GoRuntimeMemStatsCollection
// metrics and GoRuntimeMetricsCollection will be exposed.
//
// Use WithGoCollections(GoRuntimeMemStatsCollection) to have Go collector working in
// the compatibility mode with client_golang pre v1.12 (move to runtime/metrics).
// The current default is GoRuntimeMemStatsCollection, so the compatibility mode with
// client_golang pre v1.12 (move to runtime/metrics).
func WithGoCollections(flags uint32) goOption {
return func(o *goOptions) {
o.EnabledCollections = flags
Expand Down
2 changes: 1 addition & 1 deletion prometheus/go_collector_latest.go
Expand Up @@ -132,7 +132,7 @@ func (c GoCollectorOptions) isEnabled(flag uint32) bool {
return c.EnabledCollections&flag != 0
}

const defaultGoCollections = goRuntimeMemStatsCollection | goRuntimeMetricsCollection
const defaultGoCollections = goRuntimeMemStatsCollection

// NewGoCollector is the obsolete version of collectors.NewGoCollector.
// See there for documentation.
Expand Down
2 changes: 1 addition & 1 deletion prometheus/go_collector_latest_test.go
Expand Up @@ -117,7 +117,7 @@ func TestGoCollector(t *testing.T) {
var sink interface{}

func TestBatchHistogram(t *testing.T) {
goMetrics := collectGoMetrics(t, defaultGoCollections)
goMetrics := collectGoMetrics(t, goRuntimeMetricsCollection)

var mhist Metric
for _, m := range goMetrics {
Expand Down