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

Author: rexagod

pkg/metric/metric.go

@@ -44,8 +44,8 @@ type Type string
 type TypeN int
 
 // String returns the string representation of the metric type.
-func (i TypeN) String() Type {
-	return MetricTypeNMap[i]
+func (i TypeN) String() string {
+	return string(TypeNMap[i])
 }
 
 // NString returns the string representation of the metric type as an integer.
@@ -55,7 +55,7 @@ func (i TypeN) NString() string {
 
 // Supported metric types.
 const (
-	// GaugeN defines a OpenMetrics gauge.
+	// GaugeN defines an OpenMetrics gauge.
 	GaugeN TypeN = iota
 
 	// InfoN defines an OpenMetrics info.
@@ -64,14 +64,14 @@ const (
 	// StateSetN defines an OpenMetrics stateset.
 	StateSetN
 
-	// CounterN defines a OpenMetrics counter.
+	// CounterN defines an OpenMetrics counter.
 	CounterN
 )
 
 // Supported metric types.
 var (
 
-	// Gauge defines a OpenMetrics gauge.
+	// Gauge defines an OpenMetrics gauge.
 	Gauge Type = "gauge"
 
 	// Info defines an OpenMetrics info.
@@ -80,19 +80,19 @@ var (
 	// StateSet defines an OpenMetrics stateset.
 	StateSet Type = "stateset"
 
-	// Counter defines a OpenMetrics counter.
+	// Counter defines an OpenMetrics counter.
 	Counter Type = "counter"
 
-	// MetricTypeNMap is a map of MetricTypeN to MetricType.
-	MetricTypeNMap = map[TypeN]Type{
+	// TypeNMap is a map of MetricTypeN to MetricType.
+	TypeNMap = map[TypeN]Type{
 		GaugeN:    Gauge,
 		InfoN:     Info,
 		StateSetN: StateSet,
 		CounterN:  Counter,
 	}
 
-	// MetricTypeMap is a map of MetricType to MetricTypeN.
-	MetricTypeMap = map[Type]TypeN{
+	// TypeMap is a map of MetricType to MetricTypeN.
+	TypeMap = map[Type]TypeN{
 		Gauge:    GaugeN,
 		Info:     InfoN,
 		StateSet: StateSetN,

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.MetricTypeMap[g.Type].NString())
+	header.WriteString(metric.TypeMap[g.Type].NString())
 
 	return header.String()
 }

pkg/metrics_store/metrics_writer.go

@@ -115,8 +115,8 @@ func SanitizeHeaders(contentType string, writers MetricsWriterList) MetricsWrite
 
 					// Replace all remaining type enums with their string representations.
 					n := int(header[len(header)-1]) - '0'
-					if n >= 0 && n < len(metric.MetricTypeNMap) {
-						writer.stores[0].headers[i] = header[:len(header)-1] + string(metric.MetricTypeNMap[metric.TypeN(n)])
+					if n >= 0 && n < len(metric.TypeNMap) {
+						writer.stores[0].headers[i] = header[:len(header)-1] + string(metric.TypeNMap[metric.TypeN(n)])
 					}
 				}
 			}