Fix linting

Co-authored by: Fiona Liao <fiona.liao@grafana.com>:

Signed-off-by: Carrie Edwards <edwrdscarrie@gmail.com>

tsdb/testutil.go

@@ -14,9 +14,10 @@
 package tsdb
 
 import (
-	prom_testutil "github.com/prometheus/client_golang/prometheus/testutil"
 	"testing"
 
+	prom_testutil "github.com/prometheus/client_golang/prometheus/testutil"
+
 	"github.com/prometheus/prometheus/tsdb/chunkenc"
 
 	"github.com/stretchr/testify/require"
@@ -55,50 +56,50 @@ var sampleTypeScenarios = map[string]sampleTypeScenario{
 			return sample{t: ts, f: float64(value)}
 		},
 	},
-	//intHistogram: {
-	//	sampleType: sampleMetricTypeHistogram,
-	//	appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
-	//		s := sample{t: ts, h: tsdbutil.GenerateTestHistogram(int(value))}
-	//		ref, err := appender.AppendHistogram(0, lbls, ts, s.h, nil)
-	//		return ref, s, err
-	//	},
-	//	sampleFunc: func(ts, value int64) sample {
-	//		return sample{t: ts, h: tsdbutil.GenerateTestHistogram(int(value))}
-	//	},
-	//},
-	//floatHistogram: {
-	//	sampleType: sampleMetricTypeHistogram,
-	//	appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
-	//		s := sample{t: ts, fh: tsdbutil.GenerateTestFloatHistogram(int(value))}
-	//		ref, err := appender.AppendHistogram(0, lbls, ts, nil, s.fh)
-	//		return ref, s, err
-	//	},
-	//	sampleFunc: func(ts, value int64) sample {
-	//		return sample{t: ts, fh: tsdbutil.GenerateTestFloatHistogram(int(value))}
-	//	},
-	//},
-	//gaugeIntHistogram: {
-	//	sampleType: sampleMetricTypeHistogram,
-	//	appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
-	//		s := sample{t: ts, h: tsdbutil.GenerateTestGaugeHistogram(int(value))}
-	//		ref, err := appender.AppendHistogram(0, lbls, ts, s.h, nil)
-	//		return ref, s, err
-	//	},
-	//	sampleFunc: func(ts, value int64) sample {
-	//		return sample{t: ts, h: tsdbutil.GenerateTestGaugeHistogram(int(value))}
-	//	},
-	//},
-	//gaugeFloatHistogram: {
-	//	sampleType: sampleMetricTypeHistogram,
-	//	appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
-	//		s := sample{t: ts, fh: tsdbutil.GenerateTestGaugeFloatHistogram(int(value))}
-	//		ref, err := appender.AppendHistogram(0, lbls, ts, nil, s.fh)
-	//		return ref, s, err
-	//	},
-	//	sampleFunc: func(ts, value int64) sample {
-	//		return sample{t: ts, fh: tsdbutil.GenerateTestGaugeFloatHistogram(int(value))}
-	//	},
-	//},
+	// intHistogram: {
+	//	 sampleType: sampleMetricTypeHistogram,
+	//	 appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
+	//		 s := sample{t: ts, h: tsdbutil.GenerateTestHistogram(int(value))}
+	//		 ref, err := appender.AppendHistogram(0, lbls, ts, s.h, nil)
+	//		 return ref, s, err
+	//	 },
+	//	 sampleFunc: func(ts, value int64) sample {
+	//		 return sample{t: ts, h: tsdbutil.GenerateTestHistogram(int(value))}
+	//	 },
+	// },
+	// floatHistogram: {
+	//	 sampleType: sampleMetricTypeHistogram,
+	//	 appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
+	//		 s := sample{t: ts, fh: tsdbutil.GenerateTestFloatHistogram(int(value))}
+	//		 ref, err := appender.AppendHistogram(0, lbls, ts, nil, s.fh)
+	//		 return ref, s, err
+	//	 },
+	//	 sampleFunc: func(ts, value int64) sample {
+	//		 return sample{t: ts, fh: tsdbutil.GenerateTestFloatHistogram(int(value))}
+	//	 },
+	// },
+	// gaugeIntHistogram: {
+	//	 sampleType: sampleMetricTypeHistogram,
+	//	 appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
+	//		 s := sample{t: ts, h: tsdbutil.GenerateTestGaugeHistogram(int(value))}
+	//		 ref, err := appender.AppendHistogram(0, lbls, ts, s.h, nil)
+	//		 return ref, s, err
+	//	 },
+	//	 sampleFunc: func(ts, value int64) sample {
+	//		 return sample{t: ts, h: tsdbutil.GenerateTestGaugeHistogram(int(value))}
+	//	 },
+	// },
+	// gaugeFloatHistogram: {
+	//	 sampleType: sampleMetricTypeHistogram,
+	//	 appendFunc: func(appender storage.Appender, lbls labels.Labels, ts, value int64) (storage.SeriesRef, sample, error) {
+	//		 s := sample{t: ts, fh: tsdbutil.GenerateTestGaugeFloatHistogram(int(value))}
+	//		 ref, err := appender.AppendHistogram(0, lbls, ts, nil, s.fh)
+	//		 return ref, s, err
+	//	 },
+	//	 sampleFunc: func(ts, value int64) sample {
+	//		 return sample{t: ts, fh: tsdbutil.GenerateTestGaugeFloatHistogram(int(value))}
+	//	 },
+	// },
 }
 
 // requireEqualSamples checks that the actual series are equal to the expected ones. It ignores the counter reset hints for histograms.