Added support for go 1.20.

.circleci/config.yml

@@ -46,10 +46,6 @@ workflows:
   client_golang:
     jobs:
       # Refer to README.md for the currently supported versions.
-      - test:
-          name: go-1-17
-          go_version: "1.17"
-          run_lint: true
       - test:
           name: go-1-18
           go_version: "1.18"
@@ -58,6 +54,10 @@ workflows:
           name: go-1-19
           go_version: "1.19"
           run_lint: true
+      - test:
+          name: go-1-20
+          go_version: "1.20"
+          run_lint: true
           # Style and unused/missing packages are only checked against
           # the latest supported Go version.
           run_style_and_unused: true

Makefile

@@ -20,7 +20,7 @@ test: deps common-test
 test-short: deps common-test-short
 
 .PHONY: generate-go-collector-test-files
-VERSIONS := 1.17 1.18 1.19
+VERSIONS := 1.17 1.18 1.19 1.20
 generate-go-collector-test-files:
 	for GO_VERSION in $(VERSIONS); do \
     	docker run --rm -v $(PWD):/workspace -w /workspace golang:$$GO_VERSION go run prometheus/gen_go_collector_metrics_set.go; \

README.md

@@ -10,7 +10,7 @@ This is the [Go](http://golang.org) client library for
 instrumenting application code, and one for creating clients that talk to the
 Prometheus HTTP API.
 
-__This library requires Go1.17 or later.__
+__This library requires Go1.18 or later.__
 
 ## Important note about releases and stability
 

prometheus/collectors/go_collector_go120_test.go

@@ -0,0 +1,119 @@
+// 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.20 && !go1.21
+// +build go1.20,!go1.21
+
+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_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_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",
+		"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_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",
+	}
+}

prometheus/collectors/go_collector_latest.go

@@ -28,6 +28,8 @@ var (
 	MetricsAll = GoRuntimeMetricsRule{regexp.MustCompile("/.*")}
 	// MetricsGC allows only GC metrics to be collected from Go runtime.
 	// e.g. go_gc_cycles_automatic_gc_cycles_total
+	// NOTE: This does not include new class of "/cpu/classes/gc/..." metrics.
+	// Use custom metric rule to access those.
 	MetricsGC = GoRuntimeMetricsRule{regexp.MustCompile(`^/gc/.*`)}
 	// MetricsMemory allows only memory metrics to be collected from Go runtime.
 	// e.g. go_memory_classes_heap_free_bytes

prometheus/gen_go_collector_metrics_set.go

@@ -50,7 +50,9 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	gv, err := version.NewVersion(strings.TrimPrefix(toolVersion, "go"))
+
+	toolVersion = strings.Split(strings.TrimPrefix(toolVersion, "go"), " ")[0]
+	gv, err := version.NewVersion(toolVersion)
 	if err != nil {
 		log.Fatal(err)
 	}