use expfmt.NewFormat instead of now-private formats directly

These were removed upstream in prometheus/common#576
grafana · Mar 5, 2024 · 359e503 · 359e503
1 parent 2c7e183
commit 359e503
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/internal/k6runner/k6runner.go b/internal/k6runner/k6runner.go
@@ -186,7 +186,7 @@ func (rc *checkResultCollector) process(mf *dto.MetricFamily, sample *model.Samp
 }
 
 func extractMetricSamples(metrics []byte, logger zerolog.Logger, processors ...sampleProcessorFunc) error {
-	promDecoder := expfmt.NewDecoder(bytes.NewBuffer(metrics), expfmt.FmtText)
+	promDecoder := expfmt.NewDecoder(bytes.NewBuffer(metrics), expfmt.NewFormat(expfmt.TypeTextPlain))
 	decoderOpts := expfmt.DecodeOptions{Timestamp: model.Now()}
 	for {
 		var mf dto.MetricFamily

diff --git a/internal/k6runner/k6runner_test.go b/internal/k6runner/k6runner_test.go
@@ -187,7 +187,7 @@ func TestTextToRegistry(t *testing.T) {
 
 	expectedMetrics := map[string]struct{}{}
 
-	promDecoder := expfmt.NewDecoder(bytes.NewBuffer(data), expfmt.FmtText)
+	promDecoder := expfmt.NewDecoder(bytes.NewBuffer(data), expfmt.NewFormat(expfmt.TypeTextPlain))
 DEC_LOOP:
 	for {
 		var mf dto.MetricFamily
@@ -262,8 +262,7 @@ func TestK6LogsToLogger(t *testing.T) {
 	require.NoError(t, err)
 }
 
-type testLogger struct {
-}
+type testLogger struct{}
 
 var _ logger.Logger = &testLogger{}
 

diff --git a/internal/scraper/scraper_test.go b/internal/scraper/scraper_test.go
@@ -464,7 +464,7 @@ func verifyProberMetrics(
 	if *updateGolden {
 		var buf bytes.Buffer
 
-		enc := expfmt.NewEncoder(&buf, expfmt.FmtText)
+		enc := expfmt.NewEncoder(&buf, expfmt.NewFormat(expfmt.TypeTextPlain))
 
 		for _, m := range mfs {
 			if err := enc.Encode(m); err != nil {
@@ -515,7 +515,7 @@ func readGoldenFile(fn string) (map[string]struct{}, error) {
 	}
 	defer fh.Close()
 
-	dec := expfmt.NewDecoder(fh, expfmt.FmtText)
+	dec := expfmt.NewDecoder(fh, expfmt.NewFormat(expfmt.TypeTextPlain))
 
 	metrics := map[string]struct{}{}