diff --git a/SPECS/go-github-prometheus-client-golang/2000-Fix-collector-metrics-test-for-Go-1.25.patch b/SPECS/go-github-prometheus-client-golang/2000-Fix-collector-metrics-test-for-Go-1.25.patch deleted file mode 100644 index 7974349f91..0000000000 --- a/SPECS/go-github-prometheus-client-golang/2000-Fix-collector-metrics-test-for-Go-1.25.patch +++ /dev/null @@ -1,382 +0,0 @@ -From: Daniel Swarbrick -Date: Tue, 30 Dec 2025 16:45:55 +0100 -Subject: Fix collector metrics test for Go 1.25 - -Forwarded: not-needed ---- - prometheus/collectors/go_collector_go125_test.go | 240 +++++++++++++++++++++++ - prometheus/go_collector_metrics_go125_test.go | 118 +++++++++++ - 2 files changed, 358 insertions(+) - create mode 100644 prometheus/collectors/go_collector_go125_test.go - create mode 100644 prometheus/go_collector_metrics_go125_test.go - -diff --git a/prometheus/collectors/go_collector_go125_test.go b/prometheus/collectors/go_collector_go125_test.go -new file mode 100644 -index 0000000..874f3ce ---- /dev/null -+++ b/prometheus/collectors/go_collector_go125_test.go -@@ -0,0 +1,240 @@ -+// 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.25 && !go1.26 -+// +build go1.25,!go1.26 -+ -+package collectors -+ -+func withAllMetrics() []string { -+ return withBaseMetrics([]string{ -+ "go_cgo_go_to_c_calls_calls_total", -+ "go_cpu_classes_gc_mark_assist_cpu_seconds_total", -+ "go_cpu_classes_gc_mark_dedicated_cpu_seconds_total", -+ "go_cpu_classes_gc_mark_idle_cpu_seconds_total", -+ "go_cpu_classes_gc_pause_cpu_seconds_total", -+ "go_cpu_classes_gc_total_cpu_seconds_total", -+ "go_cpu_classes_idle_cpu_seconds_total", -+ "go_cpu_classes_scavenge_assist_cpu_seconds_total", -+ "go_cpu_classes_scavenge_background_cpu_seconds_total", -+ "go_cpu_classes_scavenge_total_cpu_seconds_total", -+ "go_cpu_classes_total_cpu_seconds_total", -+ "go_cpu_classes_user_cpu_seconds_total", -+ "go_gc_cycles_automatic_gc_cycles_total", -+ "go_gc_cycles_forced_gc_cycles_total", -+ "go_gc_cycles_total_gc_cycles_total", -+ "go_gc_gogc_percent", -+ "go_gc_gomemlimit_bytes", -+ "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_live_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_scan_globals_bytes", -+ "go_gc_scan_heap_bytes", -+ "go_gc_scan_stack_bytes", -+ "go_gc_scan_total_bytes", -+ "go_gc_stack_starting_size_bytes", -+ "go_godebug_non_default_behavior_allowmultiplevcs_events_total", -+ "go_godebug_non_default_behavior_asynctimerchan_events_total", -+ "go_godebug_non_default_behavior_containermaxprocs_events_total", -+ "go_godebug_non_default_behavior_embedfollowsymlinks_events_total", -+ "go_godebug_non_default_behavior_execerrdot_events_total", -+ "go_godebug_non_default_behavior_gocachehash_events_total", -+ "go_godebug_non_default_behavior_gocachetest_events_total", -+ "go_godebug_non_default_behavior_gocacheverify_events_total", -+ "go_godebug_non_default_behavior_gotestjsonbuildtext_events_total", -+ "go_godebug_non_default_behavior_gotypesalias_events_total", -+ "go_godebug_non_default_behavior_http2client_events_total", -+ "go_godebug_non_default_behavior_http2server_events_total", -+ "go_godebug_non_default_behavior_httpcookiemaxnum_events_total", -+ "go_godebug_non_default_behavior_httplaxcontentlength_events_total", -+ "go_godebug_non_default_behavior_httpmuxgo121_events_total", -+ "go_godebug_non_default_behavior_httpservecontentkeepheaders_events_total", -+ "go_godebug_non_default_behavior_installgoroot_events_total", -+ "go_godebug_non_default_behavior_multipartmaxheaders_events_total", -+ "go_godebug_non_default_behavior_multipartmaxparts_events_total", -+ "go_godebug_non_default_behavior_multipathtcp_events_total", -+ "go_godebug_non_default_behavior_netedns0_events_total", -+ "go_godebug_non_default_behavior_panicnil_events_total", -+ "go_godebug_non_default_behavior_randautoseed_events_total", -+ "go_godebug_non_default_behavior_randseednop_events_total", -+ "go_godebug_non_default_behavior_rsa1024min_events_total", -+ "go_godebug_non_default_behavior_tarinsecurepath_events_total", -+ "go_godebug_non_default_behavior_tls10server_events_total", -+ "go_godebug_non_default_behavior_tls3des_events_total", -+ "go_godebug_non_default_behavior_tlsmaxrsasize_events_total", -+ "go_godebug_non_default_behavior_tlsrsakex_events_total", -+ "go_godebug_non_default_behavior_tlssha1_events_total", -+ "go_godebug_non_default_behavior_tlsunsafeekm_events_total", -+ "go_godebug_non_default_behavior_updatemaxprocs_events_total", -+ "go_godebug_non_default_behavior_winreadlinkvolume_events_total", -+ "go_godebug_non_default_behavior_winsymlink_events_total", -+ "go_godebug_non_default_behavior_x509keypairleaf_events_total", -+ "go_godebug_non_default_behavior_x509negativeserial_events_total", -+ "go_godebug_non_default_behavior_x509rsacrt_events_total", -+ "go_godebug_non_default_behavior_x509sha256skid_events_total", -+ "go_godebug_non_default_behavior_x509usefallbackroots_events_total", -+ "go_godebug_non_default_behavior_x509usepolicies_events_total", -+ "go_godebug_non_default_behavior_zipinsecurepath_events_total", -+ "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", -+ "go_sched_pauses_stopping_gc_seconds", -+ "go_sched_pauses_stopping_other_seconds", -+ "go_sched_pauses_total_gc_seconds", -+ "go_sched_pauses_total_other_seconds", -+ "go_sync_mutex_wait_total_seconds_total", -+ }) -+} -+ -+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_gogc_percent", -+ "go_gc_gomemlimit_bytes", -+ "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_live_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_scan_globals_bytes", -+ "go_gc_scan_heap_bytes", -+ "go_gc_scan_stack_bytes", -+ "go_gc_scan_total_bytes", -+ "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 withBaseMetrics([]string{ -+ "go_sched_gomaxprocs_threads", -+ "go_sched_goroutines_goroutines", -+ "go_sched_latencies_seconds", -+ "go_sched_pauses_stopping_gc_seconds", -+ "go_sched_pauses_stopping_other_seconds", -+ "go_sched_pauses_total_gc_seconds", -+ "go_sched_pauses_total_other_seconds", -+ }) -+} -+ -+func withDebugMetrics() []string { -+ return withBaseMetrics([]string{ -+ "go_godebug_non_default_behavior_allowmultiplevcs_events_total", -+ "go_godebug_non_default_behavior_asynctimerchan_events_total", -+ "go_godebug_non_default_behavior_containermaxprocs_events_total", -+ "go_godebug_non_default_behavior_embedfollowsymlinks_events_total", -+ "go_godebug_non_default_behavior_execerrdot_events_total", -+ "go_godebug_non_default_behavior_gocachehash_events_total", -+ "go_godebug_non_default_behavior_gocachetest_events_total", -+ "go_godebug_non_default_behavior_gocacheverify_events_total", -+ "go_godebug_non_default_behavior_gotestjsonbuildtext_events_total", -+ "go_godebug_non_default_behavior_gotypesalias_events_total", -+ "go_godebug_non_default_behavior_http2client_events_total", -+ "go_godebug_non_default_behavior_http2server_events_total", -+ "go_godebug_non_default_behavior_httpcookiemaxnum_events_total", -+ "go_godebug_non_default_behavior_httplaxcontentlength_events_total", -+ "go_godebug_non_default_behavior_httpmuxgo121_events_total", -+ "go_godebug_non_default_behavior_httpservecontentkeepheaders_events_total", -+ "go_godebug_non_default_behavior_installgoroot_events_total", -+ "go_godebug_non_default_behavior_multipartmaxheaders_events_total", -+ "go_godebug_non_default_behavior_multipartmaxparts_events_total", -+ "go_godebug_non_default_behavior_multipathtcp_events_total", -+ "go_godebug_non_default_behavior_netedns0_events_total", -+ "go_godebug_non_default_behavior_panicnil_events_total", -+ "go_godebug_non_default_behavior_randautoseed_events_total", -+ "go_godebug_non_default_behavior_randseednop_events_total", -+ "go_godebug_non_default_behavior_rsa1024min_events_total", -+ "go_godebug_non_default_behavior_tarinsecurepath_events_total", -+ "go_godebug_non_default_behavior_tls10server_events_total", -+ "go_godebug_non_default_behavior_tls3des_events_total", -+ "go_godebug_non_default_behavior_tlsmaxrsasize_events_total", -+ "go_godebug_non_default_behavior_tlsrsakex_events_total", -+ "go_godebug_non_default_behavior_tlssha1_events_total", -+ "go_godebug_non_default_behavior_tlsunsafeekm_events_total", -+ "go_godebug_non_default_behavior_updatemaxprocs_events_total", -+ "go_godebug_non_default_behavior_winreadlinkvolume_events_total", -+ "go_godebug_non_default_behavior_winsymlink_events_total", -+ "go_godebug_non_default_behavior_x509keypairleaf_events_total", -+ "go_godebug_non_default_behavior_x509negativeserial_events_total", -+ "go_godebug_non_default_behavior_x509rsacrt_events_total", -+ "go_godebug_non_default_behavior_x509sha256skid_events_total", -+ "go_godebug_non_default_behavior_x509usefallbackroots_events_total", -+ "go_godebug_non_default_behavior_x509usepolicies_events_total", -+ "go_godebug_non_default_behavior_zipinsecurepath_events_total", -+ }) -+} -+ -+var ( -+ defaultRuntimeMetrics = []string{ -+ "go_gc_gogc_percent", -+ "go_gc_gomemlimit_bytes", -+ "go_sched_gomaxprocs_threads", -+ } -+ onlyGCDefRuntimeMetrics = []string{ -+ "go_gc_gogc_percent", -+ "go_gc_gomemlimit_bytes", -+ } -+ onlySchedDefRuntimeMetrics = []string{ -+ "go_sched_gomaxprocs_threads", -+ } -+) -diff --git a/prometheus/go_collector_metrics_go125_test.go b/prometheus/go_collector_metrics_go125_test.go -new file mode 100644 -index 0000000..e0276a2 ---- /dev/null -+++ b/prometheus/go_collector_metrics_go125_test.go -@@ -0,0 +1,118 @@ -+// Code generated by gen_go_collector_metrics_set.go; DO NOT EDIT. -+//go:generate go run gen_go_collector_metrics_set.go go1.25 -+ -+//go:build go1.25 && !go1.26 -+// +build go1.25,!go1.26 -+ -+package prometheus -+ -+var ( -+ expectedRuntimeMetrics = map[string]string{ -+ "/cgo/go-to-c-calls:calls": "go_cgo_go_to_c_calls_calls_total", -+ "/cpu/classes/gc/mark/assist:cpu-seconds": "go_cpu_classes_gc_mark_assist_cpu_seconds_total", -+ "/cpu/classes/gc/mark/dedicated:cpu-seconds": "go_cpu_classes_gc_mark_dedicated_cpu_seconds_total", -+ "/cpu/classes/gc/mark/idle:cpu-seconds": "go_cpu_classes_gc_mark_idle_cpu_seconds_total", -+ "/cpu/classes/gc/pause:cpu-seconds": "go_cpu_classes_gc_pause_cpu_seconds_total", -+ "/cpu/classes/gc/total:cpu-seconds": "go_cpu_classes_gc_total_cpu_seconds_total", -+ "/cpu/classes/idle:cpu-seconds": "go_cpu_classes_idle_cpu_seconds_total", -+ "/cpu/classes/scavenge/assist:cpu-seconds": "go_cpu_classes_scavenge_assist_cpu_seconds_total", -+ "/cpu/classes/scavenge/background:cpu-seconds": "go_cpu_classes_scavenge_background_cpu_seconds_total", -+ "/cpu/classes/scavenge/total:cpu-seconds": "go_cpu_classes_scavenge_total_cpu_seconds_total", -+ "/cpu/classes/total:cpu-seconds": "go_cpu_classes_total_cpu_seconds_total", -+ "/cpu/classes/user:cpu-seconds": "go_cpu_classes_user_cpu_seconds_total", -+ "/gc/cycles/automatic:gc-cycles": "go_gc_cycles_automatic_gc_cycles_total", -+ "/gc/cycles/forced:gc-cycles": "go_gc_cycles_forced_gc_cycles_total", -+ "/gc/cycles/total:gc-cycles": "go_gc_cycles_total_gc_cycles_total", -+ "/gc/gogc:percent": "go_gc_gogc_percent", -+ "/gc/gomemlimit:bytes": "go_gc_gomemlimit_bytes", -+ "/gc/heap/allocs-by-size:bytes": "go_gc_heap_allocs_by_size_bytes", -+ "/gc/heap/allocs:bytes": "go_gc_heap_allocs_bytes_total", -+ "/gc/heap/allocs:objects": "go_gc_heap_allocs_objects_total", -+ "/gc/heap/frees-by-size:bytes": "go_gc_heap_frees_by_size_bytes", -+ "/gc/heap/frees:bytes": "go_gc_heap_frees_bytes_total", -+ "/gc/heap/frees:objects": "go_gc_heap_frees_objects_total", -+ "/gc/heap/goal:bytes": "go_gc_heap_goal_bytes", -+ "/gc/heap/live:bytes": "go_gc_heap_live_bytes", -+ "/gc/heap/objects:objects": "go_gc_heap_objects_objects", -+ "/gc/heap/tiny/allocs:objects": "go_gc_heap_tiny_allocs_objects_total", -+ "/gc/limiter/last-enabled:gc-cycle": "go_gc_limiter_last_enabled_gc_cycle", -+ "/gc/pauses:seconds": "go_gc_pauses_seconds", -+ "/gc/scan/globals:bytes": "go_gc_scan_globals_bytes", -+ "/gc/scan/heap:bytes": "go_gc_scan_heap_bytes", -+ "/gc/scan/stack:bytes": "go_gc_scan_stack_bytes", -+ "/gc/scan/total:bytes": "go_gc_scan_total_bytes", -+ "/gc/stack/starting-size:bytes": "go_gc_stack_starting_size_bytes", -+ "/godebug/non-default-behavior/allowmultiplevcs:events": "go_godebug_non_default_behavior_allowmultiplevcs_events_total", -+ "/godebug/non-default-behavior/asynctimerchan:events": "go_godebug_non_default_behavior_asynctimerchan_events_total", -+ "/godebug/non-default-behavior/containermaxprocs:events": "go_godebug_non_default_behavior_containermaxprocs_events_total", -+ "/godebug/non-default-behavior/embedfollowsymlinks:events": "go_godebug_non_default_behavior_embedfollowsymlinks_events_total", -+ "/godebug/non-default-behavior/execerrdot:events": "go_godebug_non_default_behavior_execerrdot_events_total", -+ "/godebug/non-default-behavior/gocachehash:events": "go_godebug_non_default_behavior_gocachehash_events_total", -+ "/godebug/non-default-behavior/gocachetest:events": "go_godebug_non_default_behavior_gocachetest_events_total", -+ "/godebug/non-default-behavior/gocacheverify:events": "go_godebug_non_default_behavior_gocacheverify_events_total", -+ "/godebug/non-default-behavior/gotestjsonbuildtext:events": "go_godebug_non_default_behavior_gotestjsonbuildtext_events_total", -+ "/godebug/non-default-behavior/gotypesalias:events": "go_godebug_non_default_behavior_gotypesalias_events_total", -+ "/godebug/non-default-behavior/http2client:events": "go_godebug_non_default_behavior_http2client_events_total", -+ "/godebug/non-default-behavior/http2server:events": "go_godebug_non_default_behavior_http2server_events_total", -+ "/godebug/non-default-behavior/httpcookiemaxnum:events": "go_godebug_non_default_behavior_httpcookiemaxnum_events_total", -+ "/godebug/non-default-behavior/httplaxcontentlength:events": "go_godebug_non_default_behavior_httplaxcontentlength_events_total", -+ "/godebug/non-default-behavior/httpmuxgo121:events": "go_godebug_non_default_behavior_httpmuxgo121_events_total", -+ "/godebug/non-default-behavior/httpservecontentkeepheaders:events": "go_godebug_non_default_behavior_httpservecontentkeepheaders_events_total", -+ "/godebug/non-default-behavior/installgoroot:events": "go_godebug_non_default_behavior_installgoroot_events_total", -+ "/godebug/non-default-behavior/multipartmaxheaders:events": "go_godebug_non_default_behavior_multipartmaxheaders_events_total", -+ "/godebug/non-default-behavior/multipartmaxparts:events": "go_godebug_non_default_behavior_multipartmaxparts_events_total", -+ "/godebug/non-default-behavior/multipathtcp:events": "go_godebug_non_default_behavior_multipathtcp_events_total", -+ "/godebug/non-default-behavior/netedns0:events": "go_godebug_non_default_behavior_netedns0_events_total", -+ "/godebug/non-default-behavior/panicnil:events": "go_godebug_non_default_behavior_panicnil_events_total", -+ "/godebug/non-default-behavior/randautoseed:events": "go_godebug_non_default_behavior_randautoseed_events_total", -+ "/godebug/non-default-behavior/randseednop:events": "go_godebug_non_default_behavior_randseednop_events_total", -+ "/godebug/non-default-behavior/rsa1024min:events": "go_godebug_non_default_behavior_rsa1024min_events_total", -+ "/godebug/non-default-behavior/tarinsecurepath:events": "go_godebug_non_default_behavior_tarinsecurepath_events_total", -+ "/godebug/non-default-behavior/tls10server:events": "go_godebug_non_default_behavior_tls10server_events_total", -+ "/godebug/non-default-behavior/tls3des:events": "go_godebug_non_default_behavior_tls3des_events_total", -+ "/godebug/non-default-behavior/tlsmaxrsasize:events": "go_godebug_non_default_behavior_tlsmaxrsasize_events_total", -+ "/godebug/non-default-behavior/tlsrsakex:events": "go_godebug_non_default_behavior_tlsrsakex_events_total", -+ "/godebug/non-default-behavior/tlssha1:events": "go_godebug_non_default_behavior_tlssha1_events_total", -+ "/godebug/non-default-behavior/tlsunsafeekm:events": "go_godebug_non_default_behavior_tlsunsafeekm_events_total", -+ "/godebug/non-default-behavior/updatemaxprocs:events": "go_godebug_non_default_behavior_updatemaxprocs_events_total", -+ "/godebug/non-default-behavior/winreadlinkvolume:events": "go_godebug_non_default_behavior_winreadlinkvolume_events_total", -+ "/godebug/non-default-behavior/winsymlink:events": "go_godebug_non_default_behavior_winsymlink_events_total", -+ "/godebug/non-default-behavior/x509keypairleaf:events": "go_godebug_non_default_behavior_x509keypairleaf_events_total", -+ "/godebug/non-default-behavior/x509negativeserial:events": "go_godebug_non_default_behavior_x509negativeserial_events_total", -+ "/godebug/non-default-behavior/x509rsacrt:events": "go_godebug_non_default_behavior_x509rsacrt_events_total", -+ "/godebug/non-default-behavior/x509sha256skid:events": "go_godebug_non_default_behavior_x509sha256skid_events_total", -+ "/godebug/non-default-behavior/x509usefallbackroots:events": "go_godebug_non_default_behavior_x509usefallbackroots_events_total", -+ "/godebug/non-default-behavior/x509usepolicies:events": "go_godebug_non_default_behavior_x509usepolicies_events_total", -+ "/godebug/non-default-behavior/zipinsecurepath:events": "go_godebug_non_default_behavior_zipinsecurepath_events_total", -+ "/memory/classes/heap/free:bytes": "go_memory_classes_heap_free_bytes", -+ "/memory/classes/heap/objects:bytes": "go_memory_classes_heap_objects_bytes", -+ "/memory/classes/heap/released:bytes": "go_memory_classes_heap_released_bytes", -+ "/memory/classes/heap/stacks:bytes": "go_memory_classes_heap_stacks_bytes", -+ "/memory/classes/heap/unused:bytes": "go_memory_classes_heap_unused_bytes", -+ "/memory/classes/metadata/mcache/free:bytes": "go_memory_classes_metadata_mcache_free_bytes", -+ "/memory/classes/metadata/mcache/inuse:bytes": "go_memory_classes_metadata_mcache_inuse_bytes", -+ "/memory/classes/metadata/mspan/free:bytes": "go_memory_classes_metadata_mspan_free_bytes", -+ "/memory/classes/metadata/mspan/inuse:bytes": "go_memory_classes_metadata_mspan_inuse_bytes", -+ "/memory/classes/metadata/other:bytes": "go_memory_classes_metadata_other_bytes", -+ "/memory/classes/os-stacks:bytes": "go_memory_classes_os_stacks_bytes", -+ "/memory/classes/other:bytes": "go_memory_classes_other_bytes", -+ "/memory/classes/profiling/buckets:bytes": "go_memory_classes_profiling_buckets_bytes", -+ "/memory/classes/total:bytes": "go_memory_classes_total_bytes", -+ "/sched/gomaxprocs:threads": "go_sched_gomaxprocs_threads", -+ "/sched/goroutines:goroutines": "go_sched_goroutines_goroutines", -+ "/sched/latencies:seconds": "go_sched_latencies_seconds", -+ "/sched/pauses/stopping/gc:seconds": "go_sched_pauses_stopping_gc_seconds", -+ "/sched/pauses/stopping/other:seconds": "go_sched_pauses_stopping_other_seconds", -+ "/sched/pauses/total/gc:seconds": "go_sched_pauses_total_gc_seconds", -+ "/sched/pauses/total/other:seconds": "go_sched_pauses_total_other_seconds", -+ "/sync/mutex/wait/total:seconds": "go_sync_mutex_wait_total_seconds_total", -+ } -+ -+ expMetrics = map[string]string{ -+ "/gc/gogc:percent": "go_gc_gogc_percent", -+ "/gc/gomemlimit:bytes": "go_gc_gomemlimit_bytes", -+ "/sched/gomaxprocs:threads": "go_sched_gomaxprocs_threads", -+ } -+) -+ -+const expectedRuntimeMetricsCardinality = 178 diff --git a/SPECS/go-github-prometheus-client-golang/2001-skip-mutiple-tests.patch b/SPECS/go-github-prometheus-client-golang/2001-skip-mutiple-tests.patch deleted file mode 100644 index 44746ede53..0000000000 --- a/SPECS/go-github-prometheus-client-golang/2001-skip-mutiple-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 045f6c6f474b263da714170113fbfe2f73840d54 Mon Sep 17 00:00:00 2001 -From: misaka00251 -Date: Thu, 8 Jan 2026 12:57:53 +0800 -Subject: [PATCH] skip mutiple tests - ---- - prometheus/collectors/go_collector_latest_test.go | 1 + - prometheus/go_collector_latest_test.go | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/prometheus/collectors/go_collector_latest_test.go b/prometheus/collectors/go_collector_latest_test.go -index 4d8f87a..151dc9c 100644 ---- a/prometheus/collectors/go_collector_latest_test.go -+++ b/prometheus/collectors/go_collector_latest_test.go -@@ -137,6 +137,7 @@ func TestWithGoCollectorMemStatsMetricsDisabled(t *testing.T) { - } - - func TestGoCollectorAllowList(t *testing.T) { -+ t.Skip() - for _, test := range []struct { - name string - rules []GoRuntimeMetricsRule -diff --git a/prometheus/go_collector_latest_test.go b/prometheus/go_collector_latest_test.go -index 2fbe01b..9046bee 100644 ---- a/prometheus/go_collector_latest_test.go -+++ b/prometheus/go_collector_latest_test.go -@@ -82,6 +82,7 @@ func addExpectedDefaultRuntimeMetrics(metrics map[string]struct{}) map[string]st - } - - func TestGoCollector_ExposedMetrics(t *testing.T) { -+ t.Skip() - for _, tcase := range []struct { - opts internal.GoCollectorOptions - expectedFQNameSet map[string]struct{} -@@ -307,6 +308,7 @@ func TestMemStatsEquivalence(t *testing.T) { - } - - func TestExpectedRuntimeMetrics(t *testing.T) { -+ t.Skip() - goMetrics := collectGoMetrics(t, internal.GoCollectorOptions{ - DisableMemStatsLikeMetrics: true, - RuntimeMetricRules: []internal.GoCollectorRule{ --- -2.52.0 - diff --git a/SPECS/go-github-prometheus-client-golang/go-github-prometheus-client-golang.spec b/SPECS/go-github-prometheus-client-golang/go-github-prometheus-client-golang.spec index 83f6e3f3ea..54dd7707a3 100644 --- a/SPECS/go-github-prometheus-client-golang/go-github-prometheus-client-golang.spec +++ b/SPECS/go-github-prometheus-client-golang/go-github-prometheus-client-golang.spec @@ -6,6 +6,7 @@ %define _name client_golang %define go_import_path github.com/prometheus/client_golang +%define commit_id 78262a77b89922f94a19ecd25eaeb849fb58f2cc # These are sample code, so no need for testing - 251 %define go_test_exclude_glob %{shrink: github.com/prometheus/client_golang/tutorials* @@ -13,22 +14,16 @@ } Name: go-github-prometheus-client-golang -Version: 1.23.2 +Version: 1.23.2+git20260717.78262a7 Release: %autorelease Summary: Prometheus instrumentation library for Go applications License: Apache-2.0 URL: https://github.com/prometheus/client_golang -#!RemoteAsset -Source0: https://github.com/prometheus/client_golang/archive/v%{version}.tar.gz#/%{_name}-%{version}.tar.gz +#!RemoteAsset: sha256:ef46b7eb2d77986a6e422680b244af0727db647e5816617d6a1cacfe12806e3b +Source0: https://github.com/prometheus/client_golang/archive/%{commit_id}.tar.gz#/%{_name}-%{version}.tar.gz BuildArch: noarch BuildSystem: golangmodules -# https://sources.debian.org/src/golang-github-prometheus-client-golang/1.23.2-1/debian/patches/0005-Disable-tests-that-break-with-golang-1.25.patch -Patch0: 2000-Fix-collector-metrics-test-for-Go-1.25.patch -Patch1: 2001-skip-mutiple-tests.patch - -BuildOption(prep): -n %{_name}-%{version} - BuildRequires: go BuildRequires: go-rpm-macros BuildRequires: go(github.com/beorn7/perks) @@ -41,20 +36,20 @@ BuildRequires: go(github.com/prometheus/client_model) BuildRequires: go(github.com/prometheus/common) BuildRequires: go(github.com/prometheus/procfs) BuildRequires: go(go.uber.org/goleak) +BuildRequires: go(golang.org/x/sys) BuildRequires: go(google.golang.org/protobuf) Provides: go(github.com/prometheus/client_golang) = %{version} Requires: go(github.com/beorn7/perks) Requires: go(github.com/cespare/xxhash/v2) -Requires: go(github.com/google/go-cmp) Requires: go(github.com/json-iterator/go) Requires: go(github.com/klauspost/compress) Requires: go(github.com/kylelemons/godebug) Requires: go(github.com/prometheus/client_model) Requires: go(github.com/prometheus/common) Requires: go(github.com/prometheus/procfs) -Requires: go(go.uber.org/goleak) +Requires: go(golang.org/x/sys) Requires: go(google.golang.org/protobuf) %description @@ -63,10 +58,14 @@ This is the Go (http://golang.org) client library for Prometheus application code, and one for creating clients that talk to the Prometheus HTTP API. +%check -p +# synctest requires the modern timer channel implementation in GOPATH mode. +export GODEBUG=asynctimerchan=0 + %files -%license LICENSE* %doc README* +%license LICENSE* %{go_sys_gopath}/%{go_import_path} %changelog -%{?autochangelog} +%autochangelog diff --git a/SPECS/go-github-prometheus-client-model/go-github-prometheus-client-model.spec b/SPECS/go-github-prometheus-client-model/go-github-prometheus-client-model.spec index f873ee202f..d4a95afca1 100644 --- a/SPECS/go-github-prometheus-client-model/go-github-prometheus-client-model.spec +++ b/SPECS/go-github-prometheus-client-model/go-github-prometheus-client-model.spec @@ -13,13 +13,11 @@ Release: %autorelease Summary: Data model artifacts for Prometheus. License: Apache-2.0 URL: https://github.com/prometheus/client_model -#!RemoteAsset +#!RemoteAsset: sha256:47c5ea7949f68e7f7b344350c59b6bd31eeb921f0eec6c3a566e27cf1951470c Source0: https://github.com/prometheus/client_model/archive/v%{version}.tar.gz#/%{_name}-%{version}.tar.gz BuildArch: noarch BuildSystem: golangmodules -BuildOption(prep): -n %{_name}-%{version} - BuildRequires: go BuildRequires: go-rpm-macros BuildRequires: go(google.golang.org/protobuf) @@ -32,9 +30,9 @@ Requires: go(google.golang.org/protobuf) Golang data model artifacts for Prometheus. %files -%license LICENSE* %doc README* +%license LICENSE* %{go_sys_gopath}/%{go_import_path} %changelog -%{?autochangelog} +%autochangelog