Skip to content

Commit 9dd5d2a

Browse files
author
Arthur Silva Sens
authored
Merge pull request #1445 from kavu/add_go122_metrics_test
Add support for Go 1.22
2 parents 7ac9036 + c906a5e commit 9dd5d2a

File tree

5 files changed

+306
-5
lines changed

5 files changed

+306
-5
lines changed

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
go_version: ["1.19", "1.20", "1.21"]
21+
go_version: ["1.19", "1.20", "1.21", "1.22"]
2222

2323
steps:
2424
- name: Checkout code

‎Makefile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,17 @@ test: deps common-test
2121
test-short: deps common-test-short
2222

2323
.PHONY: generate-go-collector-test-files
24-
VERSIONS := 1.19 1.20 1.21
24+
VERSIONS := 1.19 1.20 1.21 1.22
2525
generate-go-collector-test-files:
2626
for GO_VERSION in $(VERSIONS); do \
27-
docker run --rm -v $(PWD):/workspace -w /workspace golang:$$GO_VERSION go run prometheus/gen_go_collector_metrics_set.go; \
28-
mv -f go_collector_metrics* prometheus; \
29-
done
27+
docker run \
28+
--platform linux/amd64 \
29+
--rm -v $(PWD):/workspace \
30+
-w /workspace \
31+
golang:$$GO_VERSION \
32+
bash ./generate-go-collector.bash; \
33+
done; \
34+
go mod tidy
3035

3136
.PHONY: fmt
3237
fmt: common-format

‎generate-go-collector.bash‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/env bash
2+
3+
set -e
4+
5+
go get github.com/hashicorp/go-version@v1.6.0
6+
go run prometheus/gen_go_collector_metrics_set.go
7+
mv -f go_collector_metrics_* prometheus

‎prometheus/collectors/go_collector_go122_test.go‎

Lines changed: 196 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,196 @@
1+
// Copyright 2022 The Prometheus Authors
2+
// Licensed under the Apache License, Version 2.0 (the "License");
3+
// you may not use this file except in compliance with the License.
4+
// You may obtain a copy of the License at
5+
//
6+
// http://www.apache.org/licenses/LICENSE-2.0
7+
//
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
14+
//go:build go1.22 && !go1.23
15+
// +build go1.22,!go1.23
16+
17+
package collectors
18+
19+
func withAllMetrics() []string {
20+
return withBaseMetrics([]string{
21+
"go_cgo_go_to_c_calls_calls_total",
22+
"go_cpu_classes_gc_mark_assist_cpu_seconds_total",
23+
"go_cpu_classes_gc_mark_dedicated_cpu_seconds_total",
24+
"go_cpu_classes_gc_mark_idle_cpu_seconds_total",
25+
"go_cpu_classes_gc_pause_cpu_seconds_total",
26+
"go_cpu_classes_gc_total_cpu_seconds_total",
27+
"go_cpu_classes_idle_cpu_seconds_total",
28+
"go_cpu_classes_scavenge_assist_cpu_seconds_total",
29+
"go_cpu_classes_scavenge_background_cpu_seconds_total",
30+
"go_cpu_classes_scavenge_total_cpu_seconds_total",
31+
"go_cpu_classes_total_cpu_seconds_total",
32+
"go_cpu_classes_user_cpu_seconds_total",
33+
"go_gc_cycles_automatic_gc_cycles_total",
34+
"go_gc_cycles_forced_gc_cycles_total",
35+
"go_gc_cycles_total_gc_cycles_total",
36+
"go_gc_gogc_percent",
37+
"go_gc_gomemlimit_bytes",
38+
"go_gc_heap_allocs_by_size_bytes",
39+
"go_gc_heap_allocs_bytes_total",
40+
"go_gc_heap_allocs_objects_total",
41+
"go_gc_heap_frees_by_size_bytes",
42+
"go_gc_heap_frees_bytes_total",
43+
"go_gc_heap_frees_objects_total",
44+
"go_gc_heap_goal_bytes",
45+
"go_gc_heap_live_bytes",
46+
"go_gc_heap_objects_objects",
47+
"go_gc_heap_tiny_allocs_objects_total",
48+
"go_gc_limiter_last_enabled_gc_cycle",
49+
"go_gc_pauses_seconds",
50+
"go_gc_scan_globals_bytes",
51+
"go_gc_scan_heap_bytes",
52+
"go_gc_scan_stack_bytes",
53+
"go_gc_scan_total_bytes",
54+
"go_gc_stack_starting_size_bytes",
55+
"go_godebug_non_default_behavior_execerrdot_events_total",
56+
"go_godebug_non_default_behavior_gocachehash_events_total",
57+
"go_godebug_non_default_behavior_gocachetest_events_total",
58+
"go_godebug_non_default_behavior_gocacheverify_events_total",
59+
"go_godebug_non_default_behavior_gotypesalias_events_total",
60+
"go_godebug_non_default_behavior_http2client_events_total",
61+
"go_godebug_non_default_behavior_http2server_events_total",
62+
"go_godebug_non_default_behavior_httplaxcontentlength_events_total",
63+
"go_godebug_non_default_behavior_httpmuxgo121_events_total",
64+
"go_godebug_non_default_behavior_installgoroot_events_total",
65+
"go_godebug_non_default_behavior_jstmpllitinterp_events_total",
66+
"go_godebug_non_default_behavior_multipartmaxheaders_events_total",
67+
"go_godebug_non_default_behavior_multipartmaxparts_events_total",
68+
"go_godebug_non_default_behavior_multipathtcp_events_total",
69+
"go_godebug_non_default_behavior_panicnil_events_total",
70+
"go_godebug_non_default_behavior_randautoseed_events_total",
71+
"go_godebug_non_default_behavior_tarinsecurepath_events_total",
72+
"go_godebug_non_default_behavior_tls10server_events_total",
73+
"go_godebug_non_default_behavior_tlsmaxrsasize_events_total",
74+
"go_godebug_non_default_behavior_tlsrsakex_events_total",
75+
"go_godebug_non_default_behavior_tlsunsafeekm_events_total",
76+
"go_godebug_non_default_behavior_x509sha1_events_total",
77+
"go_godebug_non_default_behavior_x509usefallbackroots_events_total",
78+
"go_godebug_non_default_behavior_x509usepolicies_events_total",
79+
"go_godebug_non_default_behavior_zipinsecurepath_events_total",
80+
"go_memory_classes_heap_free_bytes",
81+
"go_memory_classes_heap_objects_bytes",
82+
"go_memory_classes_heap_released_bytes",
83+
"go_memory_classes_heap_stacks_bytes",
84+
"go_memory_classes_heap_unused_bytes",
85+
"go_memory_classes_metadata_mcache_free_bytes",
86+
"go_memory_classes_metadata_mcache_inuse_bytes",
87+
"go_memory_classes_metadata_mspan_free_bytes",
88+
"go_memory_classes_metadata_mspan_inuse_bytes",
89+
"go_memory_classes_metadata_other_bytes",
90+
"go_memory_classes_os_stacks_bytes",
91+
"go_memory_classes_other_bytes",
92+
"go_memory_classes_profiling_buckets_bytes",
93+
"go_memory_classes_total_bytes",
94+
"go_sched_gomaxprocs_threads",
95+
"go_sched_goroutines_goroutines",
96+
"go_sched_latencies_seconds",
97+
"go_sched_pauses_stopping_gc_seconds",
98+
"go_sched_pauses_stopping_other_seconds",
99+
"go_sched_pauses_total_gc_seconds",
100+
"go_sched_pauses_total_other_seconds",
101+
"go_sync_mutex_wait_total_seconds_total",
102+
})
103+
}
104+
105+
func withGCMetrics() []string {
106+
return withBaseMetrics([]string{
107+
"go_gc_cycles_automatic_gc_cycles_total",
108+
"go_gc_cycles_forced_gc_cycles_total",
109+
"go_gc_cycles_total_gc_cycles_total",
110+
"go_gc_gogc_percent",
111+
"go_gc_gomemlimit_bytes",
112+
"go_gc_heap_allocs_by_size_bytes",
113+
"go_gc_heap_allocs_bytes_total",
114+
"go_gc_heap_allocs_objects_total",
115+
"go_gc_heap_frees_by_size_bytes",
116+
"go_gc_heap_frees_bytes_total",
117+
"go_gc_heap_frees_objects_total",
118+
"go_gc_heap_goal_bytes",
119+
"go_gc_heap_live_bytes",
120+
"go_gc_heap_objects_objects",
121+
"go_gc_heap_tiny_allocs_objects_total",
122+
"go_gc_limiter_last_enabled_gc_cycle",
123+
"go_gc_pauses_seconds",
124+
"go_gc_scan_globals_bytes",
125+
"go_gc_scan_heap_bytes",
126+
"go_gc_scan_stack_bytes",
127+
"go_gc_scan_total_bytes",
128+
"go_gc_stack_starting_size_bytes",
129+
})
130+
}
131+
132+
func withMemoryMetrics() []string {
133+
return withBaseMetrics([]string{
134+
"go_memory_classes_heap_free_bytes",
135+
"go_memory_classes_heap_objects_bytes",
136+
"go_memory_classes_heap_released_bytes",
137+
"go_memory_classes_heap_stacks_bytes",
138+
"go_memory_classes_heap_unused_bytes",
139+
"go_memory_classes_metadata_mcache_free_bytes",
140+
"go_memory_classes_metadata_mcache_inuse_bytes",
141+
"go_memory_classes_metadata_mspan_free_bytes",
142+
"go_memory_classes_metadata_mspan_inuse_bytes",
143+
"go_memory_classes_metadata_other_bytes",
144+
"go_memory_classes_os_stacks_bytes",
145+
"go_memory_classes_other_bytes",
146+
"go_memory_classes_profiling_buckets_bytes",
147+
"go_memory_classes_total_bytes",
148+
})
149+
}
150+
151+
func withSchedulerMetrics() []string {
152+
return []string{
153+
"go_gc_duration_seconds",
154+
"go_goroutines",
155+
"go_info",
156+
"go_memstats_last_gc_time_seconds",
157+
"go_sched_gomaxprocs_threads",
158+
"go_sched_goroutines_goroutines",
159+
"go_sched_latencies_seconds",
160+
"go_sched_pauses_stopping_gc_seconds",
161+
"go_sched_pauses_stopping_other_seconds",
162+
"go_sched_pauses_total_gc_seconds",
163+
"go_sched_pauses_total_other_seconds",
164+
"go_threads",
165+
}
166+
}
167+
168+
func withDebugMetrics() []string {
169+
return []string{
170+
"go_godebug_non_default_behavior_execerrdot_events_total",
171+
"go_godebug_non_default_behavior_gocachehash_events_total",
172+
"go_godebug_non_default_behavior_gocachetest_events_total",
173+
"go_godebug_non_default_behavior_gocacheverify_events_total",
174+
"go_godebug_non_default_behavior_gotypesalias_events_total",
175+
"go_godebug_non_default_behavior_http2client_events_total",
176+
"go_godebug_non_default_behavior_http2server_events_total",
177+
"go_godebug_non_default_behavior_httplaxcontentlength_events_total",
178+
"go_godebug_non_default_behavior_httpmuxgo121_events_total",
179+
"go_godebug_non_default_behavior_installgoroot_events_total",
180+
"go_godebug_non_default_behavior_jstmpllitinterp_events_total",
181+
"go_godebug_non_default_behavior_multipartmaxheaders_events_total",
182+
"go_godebug_non_default_behavior_multipartmaxparts_events_total",
183+
"go_godebug_non_default_behavior_multipathtcp_events_total",
184+
"go_godebug_non_default_behavior_panicnil_events_total",
185+
"go_godebug_non_default_behavior_randautoseed_events_total",
186+
"go_godebug_non_default_behavior_tarinsecurepath_events_total",
187+
"go_godebug_non_default_behavior_tls10server_events_total",
188+
"go_godebug_non_default_behavior_tlsmaxrsasize_events_total",
189+
"go_godebug_non_default_behavior_tlsrsakex_events_total",
190+
"go_godebug_non_default_behavior_tlsunsafeekm_events_total",
191+
"go_godebug_non_default_behavior_x509sha1_events_total",
192+
"go_godebug_non_default_behavior_x509usefallbackroots_events_total",
193+
"go_godebug_non_default_behavior_x509usepolicies_events_total",
194+
"go_godebug_non_default_behavior_zipinsecurepath_events_total",
195+
}
196+
}

‎prometheus/go_collector_metrics_go122_test.go‎

Lines changed: 93 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)