feat(model): remove name validation scheme global

Author: juliusmh

expfmt/decode.go

@@ -29,7 +29,7 @@ import (
 
 // Decoder types decode an input stream into metric families.
 type Decoder interface {
-	Decode(*dto.MetricFamily, model.NameValidationScheme) error
+	Decode(*dto.MetricFamily, model.ValidationScheme) error
 }
 
 // DecodeOptions contains options used by the Decoder and in sample extraction.
@@ -86,7 +86,7 @@ type protoDecoder struct {
 }
 
 // Decode implements the Decoder interface.
-func (d *protoDecoder) Decode(v *dto.MetricFamily, nameValidationScheme model.NameValidationScheme) error {
+func (d *protoDecoder) Decode(v *dto.MetricFamily, nameValidationScheme model.ValidationScheme) error {
 	opts := protodelim.UnmarshalOptions{
 		MaxSize: -1,
 	}
@@ -123,7 +123,7 @@ type textDecoder struct {
 }
 
 // Decode implements the Decoder interface.
-func (d *textDecoder) Decode(v *dto.MetricFamily, _ model.NameValidationScheme) error {
+func (d *textDecoder) Decode(v *dto.MetricFamily, _ model.ValidationScheme) error {
 	if d.err == nil {
 		// Read all metrics in one shot.
 		var p TextParser
@@ -156,7 +156,7 @@ type SampleDecoder struct {
 
 // Decode calls the Decode method of the wrapped Decoder and then extracts the
 // samples from the decoded MetricFamily into the provided model.Vector.
-func (sd *SampleDecoder) Decode(s *model.Vector, nameValidationScheme model.NameValidationScheme) error {
+func (sd *SampleDecoder) Decode(s *model.Vector, nameValidationScheme model.ValidationScheme) error {
 	err := sd.Dec.Decode(&sd.f, nameValidationScheme)
 	if err != nil {
 		return err

model/alert.go

@@ -88,7 +88,7 @@ func (a *Alert) StatusAt(ts time.Time) AlertStatus {
 }
 
 // Validate checks whether the alert data is inconsistent.
-func (a *Alert) Validate(nameValidationScheme NameValidationScheme) error {
+func (a *Alert) Validate(nameValidationScheme ValidationScheme) error {
 	if a.StartsAt.IsZero() {
 		return errors.New("start time missing")
 	}

model/labels.go

@@ -100,7 +100,7 @@ type LabelName string
 // IsValid returns true iff the name matches the pattern of LabelNameRE when
 // NameValidationScheme is set to LegacyValidation, or valid UTF-8 if
 // NameValidationScheme is set to UTF8Validation.
-func (ln LabelName) IsValid(scheme NameValidationScheme) bool {
+func (ln LabelName) IsValid(scheme ValidationScheme) bool {
 	if len(ln) == 0 {
 		return false
 	}

model/labelset.go

@@ -28,7 +28,7 @@ type LabelSet map[LabelName]LabelValue
 
 // Validate checks whether all names and values in the label set
 // are valid.
-func (ls LabelSet) Validate(nameValidationScheme NameValidationScheme) error {
+func (ls LabelSet) Validate(nameValidationScheme ValidationScheme) error {
 	for ln, lv := range ls {
 		if !ln.IsValid(nameValidationScheme) {
 			return fmt.Errorf("invalid name %q", ln)

model/metric.go

@@ -38,13 +38,13 @@ var (
 
 // NameValidationScheme is a Go enum for determining how metric and label names will
 // be validated by this library.
-type NameValidationScheme int
+type ValidationScheme int
 
 const (
 	// LegacyValidation is a setting that requires that all metric and label names
 	// conform to the original Prometheus character requirements described by
 	// MetricNameRE and LabelNameRE.
-	LegacyValidation NameValidationScheme = iota
+	LegacyValidation ValidationScheme = iota
 
 	// UTF8Validation only requires that metric and label names be valid UTF-8
 	// strings.
@@ -154,7 +154,7 @@ func (m Metric) FastFingerprint() Fingerprint {
 // IsValidMetricName returns true iff name matches the pattern of MetricNameRE
 // for legacy names, and iff it's valid UTF-8 if the UTF8Validation scheme is
 // selected.
-func IsValidMetricName(n LabelValue, scheme NameValidationScheme) bool {
+func IsValidMetricName(n LabelValue, scheme ValidationScheme) bool {
 	switch scheme {
 	case LegacyValidation:
 		return IsValidLegacyMetricName(string(n))

model/silence.go

@@ -46,7 +46,7 @@ func (m *Matcher) UnmarshalJSON(b []byte) error {
 }
 
 // Validate returns true iff all fields of the matcher have valid values.
-func (m *Matcher) Validate(nameValidationScheme NameValidationScheme) error {
+func (m *Matcher) Validate(nameValidationScheme ValidationScheme) error {
 	if !m.Name.IsValid(nameValidationScheme) {
 		return fmt.Errorf("invalid name %q", m.Name)
 	}
@@ -76,7 +76,7 @@ type Silence struct {
 }
 
 // Validate returns true iff all fields of the silence have valid values.
-func (s *Silence) Validate(nameValidationScheme NameValidationScheme) error {
+func (s *Silence) Validate(nameValidationScheme ValidationScheme) error {
 	if len(s.Matchers) == 0 {
 		return errors.New("at least one matcher required")
 	}