fixup! fixup! fixup! fix: fallback to gauge for protofmt-based negotiations

Author: rexagod

pkg/customresourcestate/registry_factory.go

@@ -152,7 +152,7 @@ type compiledMetric interface {
 
 // newCompiledMetric returns a compiledMetric depending on the given metric type.
 func newCompiledMetric(m Metric) (compiledMetric, error) {
-	switch m.Type {
+	switch metric.Type(strings.ToLower(string(m.Type))) {
 	case metric.Gauge:
 		if m.Gauge == nil {
 			return nil, errors.New("expected each.gauge to not be nil")

pkg/metric/metric.go

@@ -40,34 +40,11 @@ var (
 // Type represents the type of the metric. See https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#metric-types.
 type Type string
 
-// TypeN represents the type of the metric as an integer.
-type TypeN int
-
 // String returns the string representation of the metric type.
-func (i TypeN) String() string {
-	return string(TypeNMap[i])
-}
-
-// NString returns the string representation of the metric type as an integer.
-func (i TypeN) NString() string {
-	return strconv.Itoa(int(i))
+func (t Type) String() string {
+	return string(t)
 }
 
-// Supported metric types.
-const (
-	// GaugeN defines an OpenMetrics gauge.
-	GaugeN TypeN = iota
-
-	// InfoN defines an OpenMetrics info.
-	InfoN
-
-	// StateSetN defines an OpenMetrics stateset.
-	StateSetN
-
-	// CounterN defines an OpenMetrics counter.
-	CounterN
-)
-
 // Supported metric types.
 var (
 
@@ -82,22 +59,6 @@ var (
 
 	// Counter defines an OpenMetrics counter.
 	Counter Type = "counter"
-
-	// TypeNMap is a map of MetricTypeN to MetricType.
-	TypeNMap = map[TypeN]Type{
-		GaugeN:    Gauge,
-		InfoN:     Info,
-		StateSetN: StateSet,
-		CounterN:  Counter,
-	}
-
-	// TypeMap is a map of MetricType to MetricTypeN.
-	TypeMap = map[Type]TypeN{
-		Gauge:    GaugeN,
-		Info:     InfoN,
-		StateSet: StateSetN,
-		Counter:  CounterN,
-	}
 )
 
 // Metric represents a single time series.

pkg/metric_generator/generator.go

@@ -90,7 +90,7 @@ func (g *FamilyGenerator) generateHeader() string {
 	header.WriteString("# TYPE ")
 	header.WriteString(g.Name)
 	header.WriteByte(' ')
-	header.WriteString(metric.TypeMap[g.Type].NString())
+	header.WriteString(g.Type.String())
 
 	return header.String()
 }

pkg/metrics_store/metrics_writer.go

@@ -106,17 +106,16 @@ func SanitizeHeaders(contentType string, writers MetricsWriterList) MetricsWrite
 				} else if strings.HasPrefix(header, "# HELP") {
 					lastHeader = header
 
-					// If the requested content type was proto-based, replace the type with "gauge", as "info" and "statesets" are not recognized by Prometheus' protobuf machinery,
-					// else replace them by their respective string representations.
-					if strings.HasPrefix(contentType, expfmt.ProtoType) &&
-						(strings.HasSuffix(header, metric.InfoN.NString()) || strings.HasSuffix(header, metric.StateSetN.NString())) {
-						writer.stores[0].headers[i] = header[:len(header)-1] + string(metric.Gauge)
-					}
-
-					// Replace all remaining type enums with their string representations.
-					n := int(header[len(header)-1]) - '0'
-					if n >= 0 && n < len(metric.TypeNMap) {
-						writer.stores[0].headers[i] = header[:len(header)-1] + string(metric.TypeNMap[metric.TypeN(n)])
+					// If the requested content type was proto-based, replace "info" and "statesets" with "gauge", as they are not recognized by Prometheus' protobuf machinery.
+					if strings.HasPrefix(contentType, expfmt.ProtoType) {
+						infoTypeString := metric.Info.String()
+						stateSetTypeString := metric.StateSet.String()
+						if strings.HasSuffix(header, infoTypeString) {
+							writer.stores[0].headers[i] = header[:len(header)-len(infoTypeString)] + string(metric.Gauge)
+						}
+						if strings.HasSuffix(header, stateSetTypeString) {
+							writer.stores[0].headers[i] = header[:len(header)-len(stateSetTypeString)] + string(metric.Gauge)
+						}
 					}
 				}
 			}