Merge branch 'main' into kakkoyun/goroutine_leak

Author: kakkoyun

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## Unreleased
 
+* [CHANGE] prometheus: Name validation now always uses the UTF-8 scheme instead of the deprecated `model.NameValidationScheme` global. Default behavior is unchanged; code that set `NameValidationScheme = LegacyValidation` no longer gets legacy enforcement at metric, label, and push-grouping construction. #2051
 * [FEATURE] HTTP handlers created by `promhttp` package now support metrics filtering by providing one or more `name[]` query parameters. The default behavior when none are provided remains the same, returning all metrics. #1925
 * [FEATURE] promhttp: Add opt-in `HandlerOpts.CoalesceGather` to deduplicate concurrent `Gather` calls so overlapping scrapes share one collection cycle, preventing goroutine pile-up when the scrape rate outpaces collection time. #1969
 * [BUGFIX] promhttp: `InstrumentHandlerDuration` and `InstrumentHandlerCounter` no longer panic when given an observer/counter that does not implement `ExemplarObserver`/`ExemplarAdder` (e.g. a `SummaryVec`). The exemplar is dropped and the value is recorded via the plain `Observe`/`Add` path, matching the safe-cast already used by `Timer.ObserveDurationWithExemplar`. #2005

prometheus/collectors/go_collector_latest_test.go

@@ -112,7 +112,7 @@ func TestWithGoCollectorDefault(t *testing.T) {
 	expected := append(withBaseMetrics(memstatMetrics), defaultRuntimeMetrics...)
 	sort.Strings(expected)
 	if diff := cmp.Diff(got, expected); diff != "" {
-		t.Errorf("[IMPORTANT, those are default metrics, can't change in 1.x] missmatch (-want +got):\n%s", diff)
+		t.Errorf("[IMPORTANT, those are default metrics, can't change in 1.x] mismatch (-want +got):\n%s", diff)
 	}
 }
 
@@ -132,7 +132,7 @@ func TestWithGoCollectorMemStatsMetricsDisabled(t *testing.T) {
 	}
 
 	if diff := cmp.Diff(got, withBaseMetrics(defaultRuntimeMetrics)); diff != "" {
-		t.Errorf("missmatch (-want +got):\n%s", diff)
+		t.Errorf("mismatch (-want +got):\n%s", diff)
 	}
 }
 
@@ -190,7 +190,7 @@ func TestGoCollectorAllowList(t *testing.T) {
 			}
 
 			if diff := cmp.Diff(got, test.expected); diff != "" {
-				t.Errorf("missmatch (-want +got):\n%s", diff)
+				t.Errorf("mismatch (-want +got):\n%s", diff)
 			}
 		})
 	}
@@ -252,7 +252,7 @@ func TestGoCollectorDenyList(t *testing.T) {
 			}
 
 			if diff := cmp.Diff(got, test.expected); diff != "" {
-				t.Errorf("missmatch (-want +got):\n%s", diff)
+				t.Errorf("mismatch (-want +got):\n%s", diff)
 			}
 		})
 	}

prometheus/collectors/version/version_test.go

@@ -56,13 +56,13 @@ func TestGoVersionCollector(t *testing.T) {
 		}
 
 		if diff := cmp.Diff(lk, defaultLabels); diff != "" {
-			t.Errorf("missmatch (-want +got):\n%s", diff)
+			t.Errorf("mismatch (-want +got):\n%s", diff)
 		}
 
 	}
 
 	if diff := cmp.Diff(got, []string{"foo_build_info"}); diff != "" {
-		t.Errorf("missmatch (-want +got):\n%s", diff)
+		t.Errorf("mismatch (-want +got):\n%s", diff)
 	}
 }
 
@@ -103,12 +103,12 @@ func TestGoVersionCollectorWithLabels(t *testing.T) {
 		labels := append(defaultLabels, "z-mylabel")
 
 		if diff := cmp.Diff(lk, labels); diff != "" {
-			t.Errorf("missmatch (-want +got):\n%s", diff)
+			t.Errorf("mismatch (-want +got):\n%s", diff)
 		}
 
 	}
 
 	if diff := cmp.Diff(got, []string{"foo_build_info"}); diff != "" {
-		t.Errorf("missmatch (-want +got):\n%s", diff)
+		t.Errorf("mismatch (-want +got):\n%s", diff)
 	}
 }

prometheus/desc.go

@@ -111,8 +111,7 @@ func (v2) NewDesc(fqName, help string, variableLabels ConstrainableLabels, const
 	for _, opt := range opts {
 		opt(d)
 	}
-	//nolint:staticcheck // TODO: Don't use deprecated model.NameValidationScheme.
-	if !model.NameValidationScheme.IsValidMetricName(fqName) {
+	if !model.UTF8Validation.IsValidMetricName(fqName) {
 		d.err = fmt.Errorf("%q is not a valid metric name", fqName)
 		return d
 	}

prometheus/go_collector_latest_test.go

@@ -21,6 +21,7 @@ import (
 	"reflect"
 	"regexp"
 	"runtime"
+	"runtime/debug"
 	"runtime/metrics"
 	"strings"
 	"sync"
@@ -270,12 +271,16 @@ func TestMemStatsEquivalence(t *testing.T) {
 		samplesMap[descs[i].Name] = &samples[i]
 	}
 
-	// Force a GC cycle to try to reach a clean slate.
-	runtime.GC()
+	// Reach a stable slate and hold it for a single measurement window.
+	// FreeOSMemory runs a GC and returns freed memory to the OS, leaving the
+	// background scavenger nothing to release; disabling GC for the window
+	// keeps msReal and msFake observing the same runtime state. Without this,
+	// HeapReleased could drift between the two reads and fail the comparison.
+	debug.FreeOSMemory()
+	defer debug.SetGCPercent(debug.SetGCPercent(-1))
 
-	// Populate msReal.
+	// Populate msReal, then msFake back-to-back within the frozen window.
 	runtime.ReadMemStats(&msReal)
-	// Populate msFake and hope that no GC happened in between (:
 	metrics.Read(samples)
 
 	memStatsFromRM(&msFake, samplesMap)

prometheus/histogram.go

@@ -970,7 +970,7 @@ func (h *histogram) maybeReset(
 	// We are using the possibly mocked h.now() rather than
 	// time.Since(h.lastResetTime) to enable testing.
 	if h.nativeHistogramMinResetDuration == 0 || // No reset configured.
-		h.resetScheduled || // Do not interefere if a reset is already scheduled.
+		h.resetScheduled || // Do not interfere if a reset is already scheduled.
 		h.now().Sub(h.lastResetTime) < h.nativeHistogramMinResetDuration {
 		return false
 	}

prometheus/internal/difflib.go

@@ -78,7 +78,7 @@ type OpCode struct {
 // notion, pairing up elements that appear uniquely in each sequence.
 // That, and the method here, appear to yield more intuitive difference
 // reports than does diff.  This method appears to be the least vulnerable
-// to synching up on blocks of "junk lines", though (like blank lines in
+// to syncing up on blocks of "junk lines", though (like blank lines in
 // ordinary text files, or maybe "<P>" lines in HTML files).  That may be
 // because this is the only method of the 3 that has a *concept* of
 // "junk" <wink>.

prometheus/labels.go

@@ -184,6 +184,5 @@ func validateLabelValues(vals []string, expectedNumberOfValues int) error {
 }
 
 func checkLabelName(l string) bool {
-	//nolint:staticcheck // TODO: Don't use deprecated model.NameValidationScheme.
-	return model.NameValidationScheme.IsValidLabelName(l) && !strings.HasPrefix(l, reservedLabelPrefix)
+	return model.UTF8Validation.IsValidLabelName(l) && !strings.HasPrefix(l, reservedLabelPrefix)
 }

prometheus/process_collector_darwin_test.go

@@ -55,12 +55,12 @@ func TestDarwinProcessCollector(t *testing.T) {
 		regexp.MustCompile("\nprocess_max_fds [1-9]"),
 		regexp.MustCompile("\nprocess_open_fds [1-9]"),
 		regexp.MustCompile("\nprocess_virtual_memory_max_bytes (-1|[1-9])"),
-		regexp.MustCompile("\nprocess_start_time_seconds [0-9.]{10,}"),
+		regexp.MustCompile("\nprocess_start_time_seconds [0-9]"),
 		regexp.MustCompile("\nfoobar_process_cpu_seconds_total [0-9]"),
 		regexp.MustCompile("\nfoobar_process_max_fds [1-9]"),
 		regexp.MustCompile("\nfoobar_process_open_fds [1-9]"),
 		regexp.MustCompile("\nfoobar_process_virtual_memory_max_bytes (-1|[1-9])"),
-		regexp.MustCompile("\nfoobar_process_start_time_seconds [0-9.]{10,}"),
+		regexp.MustCompile("\nfoobar_process_start_time_seconds [0-9]"),
 	} {
 		if !re.Match(buf.Bytes()) {
 			t.Errorf("want body to match %s\n%s", re, buf.String())

prometheus/push/push.go

@@ -182,8 +182,7 @@ func (p *Pusher) Error() error {
 // For convenience, this method returns a pointer to the Pusher itself.
 func (p *Pusher) Grouping(name, value string) *Pusher {
 	if p.error == nil {
-		//nolint:staticcheck // TODO: Don't use deprecated model.NameValidationScheme.
-		if !model.NameValidationScheme.IsValidLabelName(name) {
+		if !model.UTF8Validation.IsValidLabelName(name) {
 			p.error = fmt.Errorf("grouping label has invalid name: %s", name)
 			return p
 		}