merge cleanups

Author: ywwg

expfmt/decode_test.go

@@ -373,7 +373,7 @@ func TestProtoDecoder(t *testing.T) {
 			model.NameValidationScheme = model.LegacyValidation
 			var smpls model.Vector
 			err := dec.Decode(&smpls)
-			if err == io.EOF {
+			if err != nil && errors.Is(err, io.EOF) {
 				break
 			}
 			if scenario.legacyNameFail {

model/metric.go

@@ -75,18 +75,14 @@ var (
 	// goroutines are started.
 	NameValidationScheme = LegacyValidation
 
+	// NameEscapingScheme defines the way that names will be
+	// escaped when presented to systems that do not support UTF-8 names.
+	NameEscapingScheme = ValueEncodingEscaping
+
 	// MetricNameRE is a regular expression matching valid metric
 	// names. Note that the IsValidMetricName function performs the same
 	// check but faster than a match with this regular expression.
 	MetricNameRE = regexp.MustCompile(`^[a-zA-Z_:][a-zA-Z0-9_:]*$`)
-	// NameValidationScheme determines the default method of name validation to be
-	// used. To avoid need for locking, this value should be set once, probably in
-	// an init(), before multiple goroutines are started.
-	NameValidationScheme = LegacyValidation
-
-	// NameEscapingScheme defines the way that names will be
-	// escaped when presented to systems that do not support UTF-8 names.
-	NameEscapingScheme = ValueEncodingEscaping
 )
 
 // A Metric is similar to a LabelSet, but the key difference is that a Metric is

model/silence.go

@@ -80,16 +80,8 @@ func (s *Silence) Validate() error {
 		return fmt.Errorf("at least one matcher required")
 	}
 	for _, m := range s.Matchers {
-<<<<<<< HEAD
-		if err := m.Validate(false); err != nil {
-			return fmt.Errorf("invalid matcher: %w", err)
-||||||| parent of 6440f53 (Try the library-wide setting)
-		if err := m.Validate(false); err != nil {
-			return fmt.Errorf("invalid matcher: %s", err)
-=======
 		if err := m.Validate(); err != nil {
-			return fmt.Errorf("invalid matcher: %s", err)
->>>>>>> 6440f53 (Try the library-wide setting)
+			return fmt.Errorf("invalid matcher: %w", err)
 		}
 	}
 	if s.StartsAt.IsZero() {