Fix go_collector_latest_test Fail on go1.19 (#1136)
Signed-off-by: rogerogers <rogers@rogerogers.com> Signed-off-by: rogerogers <rogers@rogerogers.com>
This commit is contained in:
copy rogers
GitHub
parent
4d54769c6b
commit
b785d0c828
|
|
@ -0,0 +1,100 @@
|
||||||
|
// Copyright 2022 The Prometheus Authors
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
//go:build go1.17 && !go1.19
|
||||||
|
// +build go1.17,!go1.19
|
||||||
|
|
||||||
|
package collectors
|
||||||
|
|
||||||
|
func withAllMetrics() []string {
|
||||||
|
return withBaseMetrics([]string{
|
||||||
|
"go_gc_cycles_automatic_gc_cycles_total",
|
||||||
|
"go_gc_cycles_forced_gc_cycles_total",
|
||||||
|
"go_gc_cycles_total_gc_cycles_total",
|
||||||
|
"go_gc_heap_allocs_by_size_bytes",
|
||||||
|
"go_gc_heap_allocs_bytes_total",
|
||||||
|
"go_gc_heap_allocs_objects_total",
|
||||||
|
"go_gc_heap_frees_by_size_bytes",
|
||||||
|
"go_gc_heap_frees_bytes_total",
|
||||||
|
"go_gc_heap_frees_objects_total",
|
||||||
|
"go_gc_heap_goal_bytes",
|
||||||
|
"go_gc_heap_objects_objects",
|
||||||
|
"go_gc_heap_tiny_allocs_objects_total",
|
||||||
|
"go_gc_pauses_seconds",
|
||||||
|
"go_memory_classes_heap_free_bytes",
|
||||||
|
"go_memory_classes_heap_objects_bytes",
|
||||||
|
"go_memory_classes_heap_released_bytes",
|
||||||
|
"go_memory_classes_heap_stacks_bytes",
|
||||||
|
"go_memory_classes_heap_unused_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_other_bytes",
|
||||||
|
"go_memory_classes_os_stacks_bytes",
|
||||||
|
"go_memory_classes_other_bytes",
|
||||||
|
"go_memory_classes_profiling_buckets_bytes",
|
||||||
|
"go_memory_classes_total_bytes",
|
||||||
|
"go_sched_goroutines_goroutines",
|
||||||
|
"go_sched_latencies_seconds",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func withGCMetrics() []string {
|
||||||
|
return withBaseMetrics([]string{
|
||||||
|
"go_gc_cycles_automatic_gc_cycles_total",
|
||||||
|
"go_gc_cycles_forced_gc_cycles_total",
|
||||||
|
"go_gc_cycles_total_gc_cycles_total",
|
||||||
|
"go_gc_heap_allocs_by_size_bytes",
|
||||||
|
"go_gc_heap_allocs_bytes_total",
|
||||||
|
"go_gc_heap_allocs_objects_total",
|
||||||
|
"go_gc_heap_frees_by_size_bytes",
|
||||||
|
"go_gc_heap_frees_bytes_total",
|
||||||
|
"go_gc_heap_frees_objects_total",
|
||||||
|
"go_gc_heap_goal_bytes",
|
||||||
|
"go_gc_heap_objects_objects",
|
||||||
|
"go_gc_heap_tiny_allocs_objects_total",
|
||||||
|
"go_gc_pauses_seconds",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func withMemoryMetrics() []string {
|
||||||
|
return withBaseMetrics([]string{
|
||||||
|
"go_memory_classes_heap_free_bytes",
|
||||||
|
"go_memory_classes_heap_objects_bytes",
|
||||||
|
"go_memory_classes_heap_released_bytes",
|
||||||
|
"go_memory_classes_heap_stacks_bytes",
|
||||||
|
"go_memory_classes_heap_unused_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_other_bytes",
|
||||||
|
"go_memory_classes_os_stacks_bytes",
|
||||||
|
"go_memory_classes_other_bytes",
|
||||||
|
"go_memory_classes_profiling_buckets_bytes",
|
||||||
|
"go_memory_classes_total_bytes",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func withSchedulerMetrics() []string {
|
||||||
|
return []string{
|
||||||
|
"go_gc_duration_seconds",
|
||||||
|
"go_goroutines",
|
||||||
|
"go_info",
|
||||||
|
"go_memstats_last_gc_time_seconds",
|
||||||
|
"go_sched_goroutines_goroutines",
|
||||||
|
"go_sched_latencies_seconds",
|
||||||
|
"go_threads",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,107 @@
|
||||||
|
// Copyright 2022 The Prometheus Authors
|
||||||
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
// you may not use this file except in compliance with the License.
|
||||||
|
// You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing, software
|
||||||
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
// See the License for the specific language governing permissions and
|
||||||
|
// limitations under the License.
|
||||||
|
|
||||||
|
//go:build go1.19 && !go1.20
|
||||||
|
// +build go1.19,!go1.20
|
||||||
|
|
||||||
|
package collectors
|
||||||
|
|
||||||
|
func withAllMetrics() []string {
|
||||||
|
return withBaseMetrics([]string{
|
||||||
|
"go_cgo_go_to_c_calls_calls_total",
|
||||||
|
"go_gc_cycles_automatic_gc_cycles_total",
|
||||||
|
"go_gc_cycles_forced_gc_cycles_total",
|
||||||
|
"go_gc_cycles_total_gc_cycles_total",
|
||||||
|
"go_gc_heap_allocs_by_size_bytes",
|
||||||
|
"go_gc_heap_allocs_bytes_total",
|
||||||
|
"go_gc_heap_allocs_objects_total",
|
||||||
|
"go_gc_heap_frees_by_size_bytes",
|
||||||
|
"go_gc_heap_frees_bytes_total",
|
||||||
|
"go_gc_heap_frees_objects_total",
|
||||||
|
"go_gc_heap_goal_bytes",
|
||||||
|
"go_gc_heap_objects_objects",
|
||||||
|
"go_gc_heap_tiny_allocs_objects_total",
|
||||||
|
"go_gc_limiter_last_enabled_gc_cycle",
|
||||||
|
"go_gc_pauses_seconds",
|
||||||
|
"go_gc_stack_starting_size_bytes",
|
||||||
|
"go_memory_classes_heap_free_bytes",
|
||||||
|
"go_memory_classes_heap_objects_bytes",
|
||||||
|
"go_memory_classes_heap_released_bytes",
|
||||||
|
"go_memory_classes_heap_stacks_bytes",
|
||||||
|
"go_memory_classes_heap_unused_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_other_bytes",
|
||||||
|
"go_memory_classes_os_stacks_bytes",
|
||||||
|
"go_memory_classes_other_bytes",
|
||||||
|
"go_memory_classes_profiling_buckets_bytes",
|
||||||
|
"go_memory_classes_total_bytes",
|
||||||
|
"go_sched_gomaxprocs_threads",
|
||||||
|
"go_sched_goroutines_goroutines",
|
||||||
|
"go_sched_latencies_seconds",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func withGCMetrics() []string {
|
||||||
|
return withBaseMetrics([]string{
|
||||||
|
"go_gc_cycles_automatic_gc_cycles_total",
|
||||||
|
"go_gc_cycles_forced_gc_cycles_total",
|
||||||
|
"go_gc_cycles_total_gc_cycles_total",
|
||||||
|
"go_gc_heap_allocs_by_size_bytes",
|
||||||
|
"go_gc_heap_allocs_bytes_total",
|
||||||
|
"go_gc_heap_allocs_objects_total",
|
||||||
|
"go_gc_heap_frees_by_size_bytes",
|
||||||
|
"go_gc_heap_frees_bytes_total",
|
||||||
|
"go_gc_heap_frees_objects_total",
|
||||||
|
"go_gc_heap_goal_bytes",
|
||||||
|
"go_gc_heap_objects_objects",
|
||||||
|
"go_gc_heap_tiny_allocs_objects_total",
|
||||||
|
"go_gc_limiter_last_enabled_gc_cycle",
|
||||||
|
"go_gc_pauses_seconds",
|
||||||
|
"go_gc_stack_starting_size_bytes",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func withMemoryMetrics() []string {
|
||||||
|
return withBaseMetrics([]string{
|
||||||
|
"go_memory_classes_heap_free_bytes",
|
||||||
|
"go_memory_classes_heap_objects_bytes",
|
||||||
|
"go_memory_classes_heap_released_bytes",
|
||||||
|
"go_memory_classes_heap_stacks_bytes",
|
||||||
|
"go_memory_classes_heap_unused_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mcache_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_free_bytes",
|
||||||
|
"go_memory_classes_metadata_mspan_inuse_bytes",
|
||||||
|
"go_memory_classes_metadata_other_bytes",
|
||||||
|
"go_memory_classes_os_stacks_bytes",
|
||||||
|
"go_memory_classes_other_bytes",
|
||||||
|
"go_memory_classes_profiling_buckets_bytes",
|
||||||
|
"go_memory_classes_total_bytes",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func withSchedulerMetrics() []string {
|
||||||
|
return []string{
|
||||||
|
"go_gc_duration_seconds",
|
||||||
|
"go_goroutines",
|
||||||
|
"go_info",
|
||||||
|
"go_memstats_last_gc_time_seconds",
|
||||||
|
"go_sched_gomaxprocs_threads",
|
||||||
|
"go_sched_goroutines_goroutines",
|
||||||
|
"go_sched_latencies_seconds",
|
||||||
|
"go_threads",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -86,91 +86,24 @@ func TestGoCollectorAllowList(t *testing.T) {
|
||||||
expected: baseMetrics,
|
expected: baseMetrics,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "allow all",
|
name: "allow all",
|
||||||
rules: []GoRuntimeMetricsRule{MetricsAll},
|
rules: []GoRuntimeMetricsRule{MetricsAll},
|
||||||
expected: withBaseMetrics([]string{
|
expected: withAllMetrics(),
|
||||||
"go_gc_cycles_automatic_gc_cycles_total",
|
|
||||||
"go_gc_cycles_forced_gc_cycles_total",
|
|
||||||
"go_gc_cycles_total_gc_cycles_total",
|
|
||||||
"go_gc_heap_allocs_by_size_bytes",
|
|
||||||
"go_gc_heap_allocs_bytes_total",
|
|
||||||
"go_gc_heap_allocs_objects_total",
|
|
||||||
"go_gc_heap_frees_by_size_bytes",
|
|
||||||
"go_gc_heap_frees_bytes_total",
|
|
||||||
"go_gc_heap_frees_objects_total",
|
|
||||||
"go_gc_heap_goal_bytes",
|
|
||||||
"go_gc_heap_objects_objects",
|
|
||||||
"go_gc_heap_tiny_allocs_objects_total",
|
|
||||||
"go_gc_pauses_seconds",
|
|
||||||
"go_memory_classes_heap_free_bytes",
|
|
||||||
"go_memory_classes_heap_objects_bytes",
|
|
||||||
"go_memory_classes_heap_released_bytes",
|
|
||||||
"go_memory_classes_heap_stacks_bytes",
|
|
||||||
"go_memory_classes_heap_unused_bytes",
|
|
||||||
"go_memory_classes_metadata_mcache_free_bytes",
|
|
||||||
"go_memory_classes_metadata_mcache_inuse_bytes",
|
|
||||||
"go_memory_classes_metadata_mspan_free_bytes",
|
|
||||||
"go_memory_classes_metadata_mspan_inuse_bytes",
|
|
||||||
"go_memory_classes_metadata_other_bytes",
|
|
||||||
"go_memory_classes_os_stacks_bytes",
|
|
||||||
"go_memory_classes_other_bytes",
|
|
||||||
"go_memory_classes_profiling_buckets_bytes",
|
|
||||||
"go_memory_classes_total_bytes",
|
|
||||||
"go_sched_goroutines_goroutines",
|
|
||||||
"go_sched_latencies_seconds",
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "allow GC",
|
name: "allow GC",
|
||||||
rules: []GoRuntimeMetricsRule{MetricsGC},
|
rules: []GoRuntimeMetricsRule{MetricsGC},
|
||||||
expected: withBaseMetrics([]string{
|
expected: withGCMetrics(),
|
||||||
"go_gc_cycles_automatic_gc_cycles_total",
|
|
||||||
"go_gc_cycles_forced_gc_cycles_total",
|
|
||||||
"go_gc_cycles_total_gc_cycles_total",
|
|
||||||
"go_gc_heap_allocs_by_size_bytes",
|
|
||||||
"go_gc_heap_allocs_bytes_total",
|
|
||||||
"go_gc_heap_allocs_objects_total",
|
|
||||||
"go_gc_heap_frees_by_size_bytes",
|
|
||||||
"go_gc_heap_frees_bytes_total",
|
|
||||||
"go_gc_heap_frees_objects_total",
|
|
||||||
"go_gc_heap_goal_bytes",
|
|
||||||
"go_gc_heap_objects_objects",
|
|
||||||
"go_gc_heap_tiny_allocs_objects_total",
|
|
||||||
"go_gc_pauses_seconds",
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "allow Memory",
|
name: "allow Memory",
|
||||||
rules: []GoRuntimeMetricsRule{MetricsMemory},
|
rules: []GoRuntimeMetricsRule{MetricsMemory},
|
||||||
expected: withBaseMetrics([]string{
|
expected: withMemoryMetrics(),
|
||||||
"go_memory_classes_heap_free_bytes",
|
|
||||||
"go_memory_classes_heap_objects_bytes",
|
|
||||||
"go_memory_classes_heap_released_bytes",
|
|
||||||
"go_memory_classes_heap_stacks_bytes",
|
|
||||||
"go_memory_classes_heap_unused_bytes",
|
|
||||||
"go_memory_classes_metadata_mcache_free_bytes",
|
|
||||||
"go_memory_classes_metadata_mcache_inuse_bytes",
|
|
||||||
"go_memory_classes_metadata_mspan_free_bytes",
|
|
||||||
"go_memory_classes_metadata_mspan_inuse_bytes",
|
|
||||||
"go_memory_classes_metadata_other_bytes",
|
|
||||||
"go_memory_classes_os_stacks_bytes",
|
|
||||||
"go_memory_classes_other_bytes",
|
|
||||||
"go_memory_classes_profiling_buckets_bytes",
|
|
||||||
"go_memory_classes_total_bytes",
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "allow Scheduler",
|
name: "allow Scheduler",
|
||||||
rules: []GoRuntimeMetricsRule{MetricsScheduler},
|
rules: []GoRuntimeMetricsRule{MetricsScheduler},
|
||||||
expected: []string{
|
expected: withSchedulerMetrics(),
|
||||||
"go_gc_duration_seconds",
|
|
||||||
"go_goroutines",
|
|
||||||
"go_info",
|
|
||||||
"go_memstats_last_gc_time_seconds",
|
|
||||||
"go_sched_goroutines_goroutines",
|
|
||||||
"go_sched_latencies_seconds",
|
|
||||||
"go_threads",
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
} {
|
} {
|
||||||
t.Run(test.name, func(t *testing.T) {
|
t.Run(test.name, func(t *testing.T) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue