lint and imports

Signed-off-by: Owen Williams <[email protected]>

Author: ywwg

expfmt/encode.go

@@ -19,9 +19,10 @@ import (
 	"net/http"
 
 	"google.golang.org/protobuf/encoding/protodelim"
-	"github.com/prometheus/common/model"
 	"google.golang.org/protobuf/encoding/prototext"
 
+	"github.com/prometheus/common/model"
+
 	"github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg"
 
 	dto "github.com/prometheus/client_model/go"
@@ -125,15 +126,15 @@ func NegotiateIncludingOpenMetrics(h http.Header) Format {
 		}
 		if ac.Type+"/"+ac.SubType == OpenMetricsType && (ver == OpenMetricsVersion_0_0_1 || ver == OpenMetricsVersion_1_0_0 || ver == OpenMetricsVersion_2_0_0 || ver == "") {
 			switch ver {
-				case OpenMetricsVersion_2_0_0:
-					if ac.Params["validchars"] == UTF8Valid {
-						return FmtOpenMetrics_2_0_0 + FmtUTF8Param
-					}
-					return FmtOpenMetrics_2_0_0
-				case OpenMetricsVersion_1_0_0:
-					return FmtOpenMetrics_1_0_0
-				default:
-					return FmtOpenMetrics_0_0_1
+			case OpenMetricsVersion_2_0_0:
+				if ac.Params["validchars"] == UTF8Valid {
+					return FmtOpenMetrics_2_0_0 + FmtUTF8Param
+				}
+				return FmtOpenMetrics_2_0_0
+			case OpenMetricsVersion_1_0_0:
+				return FmtOpenMetrics_1_0_0
+			default:
+				return FmtOpenMetrics_0_0_1
 			}
 		}
 	}
@@ -154,19 +155,18 @@ func NewEncoder(w io.Writer, format Format) Encoder {
 		escapingScheme = model.NoEscaping
 	}
 	switch format.FormatType() {
-		case TypeProtoDelim:
-			return encoderCloser{
-				encode: func(v *dto.MetricFamily) error {
-					_, err := pbutil.WriteDelimited(w, model.EscapeMetricFamily(v, escapingScheme))
-					return err
-				},
-				close: func() error { return nil },
-			}
+	case TypeProtoDelim:
+		return encoderCloser{
+			encode: func(v *dto.MetricFamily) error {
+				_, err := protodelim.MarshalTo(w, model.EscapeMetricFamily(v, escapingScheme))
+				return err
+			},
+			close: func() error { return nil },
+		}
 	case TypeProtoCompact:
 		return encoderCloser{
 			encode: func(v *dto.MetricFamily) error {
-				_, err := fmt.Fprintln(w, model.EscapeMetricFamily(v, escapingScheme).String())
-                _, err := protodelim.MarshalTo(w, v)
+				_, err := protodelim.MarshalTo(w, model.EscapeMetricFamily(v, escapingScheme))
 				return err
 			},
 			close: func() error { return nil },

expfmt/encode_test.go

@@ -18,9 +18,11 @@ import (
 	"net/http"
 	"testing"
 
-	dto "github.com/prometheus/client_model/go"
-	"github.com/prometheus/common/model"
 	"google.golang.org/protobuf/proto"
+
+	"github.com/prometheus/common/model"
+
+	dto "github.com/prometheus/client_model/go"
 )
 
 func TestNegotiate(t *testing.T) {
@@ -294,7 +296,6 @@ func TestEncode(t *testing.T) {
 	}
 }
 
-
 func TestEscapedEncode(t *testing.T) {
 	var buff bytes.Buffer
 	delimEncoder := NewEncoder(&buff, FmtProtoDelim+"; escaping=underscores")
@@ -310,7 +311,7 @@ func TestEscapedEncode(t *testing.T) {
 			{
 				Label: []*dto.LabelPair{
 					{
-						Name: proto.String("dotted.label.name"),
+						Name:  proto.String("dotted.label.name"),
 						Value: proto.String("my.label.value"),
 					},
 				},
@@ -378,4 +379,4 @@ U__foo_2e_metric{U__dotted_2e_label_2e_name="my.label.value"} 8
 	if string(out) != expected {
 		t.Errorf("expected TextEncoder to return %s, but got %s instead", expected, string(out))
 	}
-}
+}

expfmt/expfmt.go

@@ -47,7 +47,7 @@ const (
 	FmtOpenMetrics_2_0_0 Format = OpenMetricsType + `; version=` + OpenMetricsVersion_2_0_0 + `; charset=utf-8`
 
 	// UTF8 and Escaping Formats
-	FmtUTF8Param         Format = `; validchars=utf8`
+	FmtUTF8Param Format = `; validchars=utf8`
 )
 
 const (

expfmt/openmetrics_create_test.go

@@ -24,6 +24,7 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	dto "github.com/prometheus/client_model/go"
+
 	"github.com/prometheus/common/model"
 )
 

expfmt/text_create_test.go

@@ -22,6 +22,7 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	dto "github.com/prometheus/client_model/go"
+
 	"github.com/prometheus/common/model"
 )
 

model/metric.go

@@ -53,7 +53,7 @@ const (
 	// underscores are replaced with double underscores. This is the only escaping
 	// format that is fully round-trippable.
 	ValueEncodingEscaping
-	
+
 	// UnderscoreEscaping replaces all legacy-invalid characters with underscores.
 	// This escaping cannot be reversed.
 	UnderscoreEscaping
@@ -65,10 +65,10 @@ const (
 )
 
 const (
-	EscapeNone         = "none"
-	EscapeUnderscores  = "underscores"
-	EscapeDots         = "dots"
-	EscapeValues       = "values"
+	EscapeNone        = "none"
+	EscapeUnderscores = "underscores"
+	EscapeDots        = "dots"
+	EscapeValues      = "values"
 )
 
 var (
@@ -85,7 +85,7 @@ var (
 	// escaped when presented to systems that do not support UTF-8 names.
 	NameEscapingScheme = ValueEncodingEscaping
 
-    // MetricNameRE is a regular expression matching valid metric
+	// 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_:]*$`)
@@ -448,6 +448,6 @@ func ToEscapingScheme(s string) (EscapingScheme, error) {
 	case EscapeValues:
 		return ValueEncodingEscaping, nil
 	default:
-	  return NoEscaping, fmt.Errorf("unknown format scheme " + s)
+		return NoEscaping, fmt.Errorf("unknown format scheme " + s)
 	}
 }