mrueg
diff --git a/‎api/client.go
+6-5 b/‎api/client.go
+6-5
diff --git a/‎api/prometheus/v1/api.go
+30-30 b/‎api/prometheus/v1/api.go
+30-30
diff --git a/‎examples/middleware/httpmiddleware/httpmiddleware.go
+1-1 b/‎examples/middleware/httpmiddleware/httpmiddleware.go
+1-1
diff --git a/‎prometheus/counter.go
+10-10 b/‎prometheus/counter.go
+10-10
diff --git a/‎prometheus/desc.go
+6-6 b/‎prometheus/desc.go
+6-6
diff --git a/‎prometheus/gauge.go
+4-5 b/‎prometheus/gauge.go
+4-5
diff --git a/‎prometheus/go_collector_latest.go
+17-14 b/‎prometheus/go_collector_latest.go
+17-14
@@ -38,16 +38,17 @@ var DefaultRoundTripper http.RoundTripper = &http.Transport{
 
 // Config defines configuration parameters for a new client.
 type Config struct {
-	// The address of the Prometheus to connect to.
-	Address string
+
+	// RoundTripper is used by the Client to drive HTTP requests. If not
+	// provided, DefaultRoundTripper will be used.
+	RoundTripper http.RoundTripper
 
 	// Client is used by the Client to drive HTTP requests. If not provided,
 	// a new one based on the provided RoundTripper (or DefaultRoundTripper) will be used.
 	Client *http.Client
 
-	// RoundTripper is used by the Client to drive HTTP requests. If not
-	// provided, DefaultRoundTripper will be used.
-	RoundTripper http.RoundTripper
+	// The address of the Prometheus to connect to.
+	Address string
 }
 
 func (cfg *Config) roundTripper() http.RoundTripper {
 
@@ -544,15 +544,15 @@ type BuildinfoResult struct {
 // RuntimeinfoResult contains the result from querying the runtimeinfo endpoint.
 type RuntimeinfoResult struct {
 	StartTime           time.Time `json:"startTime"`
-	CWD                 string    `json:"CWD"`
-	ReloadConfigSuccess bool      `json:"reloadConfigSuccess"`
 	LastConfigTime      time.Time `json:"lastConfigTime"`
-	CorruptionCount     int       `json:"corruptionCount"`
-	GoroutineCount      int       `json:"goroutineCount"`
-	GOMAXPROCS          int       `json:"GOMAXPROCS"`
+	CWD                 string    `json:"CWD"`
 	GOGC                string    `json:"GOGC"`
 	GODEBUG             string    `json:"GODEBUG"`
 	StorageRetention    string    `json:"storageRetention"`
+	CorruptionCount     int       `json:"corruptionCount"`
+	GoroutineCount      int       `json:"goroutineCount"`
+	GOMAXPROCS          int       `json:"GOMAXPROCS"`
+	ReloadConfigSuccess bool      `json:"reloadConfigSuccess"`
 }
 
 // SnapshotResult contains the result from querying the snapshot endpoint.
@@ -569,8 +569,8 @@ type RulesResult struct {
 type RuleGroup struct {
 	Name     string  `json:"name"`
 	File     string  `json:"file"`
-	Interval float64 `json:"interval"`
 	Rules    Rules   `json:"rules"`
+	Interval float64 `json:"interval"`
 }
 
 // Recording and alerting rules are stored in the same slice to preserve the order
@@ -590,28 +590,28 @@ type Rules []interface{}
 
 // AlertingRule models a alerting rule.
 type AlertingRule struct {
-	Name           string         `json:"name"`
-	Query          string         `json:"query"`
-	Duration       float64        `json:"duration"`
+	LastEvaluation time.Time      `json:"lastEvaluation"`
 	Labels         model.LabelSet `json:"labels"`
 	Annotations    model.LabelSet `json:"annotations"`
-	Alerts         []*Alert       `json:"alerts"`
+	Name           string         `json:"name"`
+	Query          string         `json:"query"`
 	Health         RuleHealth     `json:"health"`
 	LastError      string         `json:"lastError,omitempty"`
-	EvaluationTime float64        `json:"evaluationTime"`
-	LastEvaluation time.Time      `json:"lastEvaluation"`
 	State          string         `json:"state"`
+	Alerts         []*Alert       `json:"alerts"`
+	Duration       float64        `json:"duration"`
+	EvaluationTime float64        `json:"evaluationTime"`
 }
 
 // RecordingRule models a recording rule.
 type RecordingRule struct {
+	LastEvaluation time.Time      `json:"lastEvaluation"`
+	Labels         model.LabelSet `json:"labels,omitempty"`
 	Name           string         `json:"name"`
 	Query          string         `json:"query"`
-	Labels         model.LabelSet `json:"labels,omitempty"`
 	Health         RuleHealth     `json:"health"`
 	LastError      string         `json:"lastError,omitempty"`
 	EvaluationTime float64        `json:"evaluationTime"`
-	LastEvaluation time.Time      `json:"lastEvaluation"`
 }
 
 // Alert models an active alert.
@@ -631,15 +631,15 @@ type TargetsResult struct {
 
 // ActiveTarget models an active Prometheus scrape target.
 type ActiveTarget struct {
+	LastScrape         time.Time         `json:"lastScrape"`
 	DiscoveredLabels   map[string]string `json:"discoveredLabels"`
 	Labels             model.LabelSet    `json:"labels"`
 	ScrapePool         string            `json:"scrapePool"`
 	ScrapeURL          string            `json:"scrapeUrl"`
 	GlobalURL          string            `json:"globalUrl"`
 	LastError          string            `json:"lastError"`
-	LastScrape         time.Time         `json:"lastScrape"`
-	LastScrapeDuration float64           `json:"lastScrapeDuration"`
 	Health             HealthStatus      `json:"health"`
+	LastScrapeDuration float64           `json:"lastScrapeDuration"`
 }
 
 // DroppedTarget models a dropped Prometheus scrape target.
@@ -665,20 +665,20 @@ type Metadata struct {
 
 // queryResult contains result data for a query.
 type queryResult struct {
-	Type   model.ValueType `json:"resultType"`
-	Result interface{}     `json:"result"`
+	Result interface{} `json:"result"`
 
 	// The decoded value.
-	v model.Value
+	v    model.Value
+	Type model.ValueType `json:"resultType"`
 }
 
 // TSDBResult contains the result from querying the tsdb endpoint.
 type TSDBResult struct {
-	HeadStats                   TSDBHeadStats `json:"headStats"`
 	SeriesCountByMetricName     []Stat        `json:"seriesCountByMetricName"`
 	LabelValueCountByLabelName  []Stat        `json:"labelValueCountByLabelName"`
 	MemoryInBytesByLabelName    []Stat        `json:"memoryInBytesByLabelName"`
 	SeriesCountByLabelValuePair []Stat        `json:"seriesCountByLabelValuePair"`
+	HeadStats                   TSDBHeadStats `json:"headStats"`
 }
 
 // TSDBHeadStats contains TSDB stats
@@ -707,8 +707,8 @@ func (rg *RuleGroup) UnmarshalJSON(b []byte) error {
 	v := struct {
 		Name     string            `json:"name"`
 		File     string            `json:"file"`
-		Interval float64           `json:"interval"`
 		Rules    []json.RawMessage `json:"rules"`
+		Interval float64           `json:"interval"`
 	}{}
 
 	if err := json.Unmarshal(b, &v); err != nil {
@@ -751,17 +751,17 @@ func (r *AlertingRule) UnmarshalJSON(b []byte) error {
 	}
 
 	rule := struct {
-		Name           string         `json:"name"`
-		Query          string         `json:"query"`
-		Duration       float64        `json:"duration"`
+		LastEvaluation time.Time      `json:"lastEvaluation"`
 		Labels         model.LabelSet `json:"labels"`
 		Annotations    model.LabelSet `json:"annotations"`
-		Alerts         []*Alert       `json:"alerts"`
+		Name           string         `json:"name"`
+		Query          string         `json:"query"`
 		Health         RuleHealth     `json:"health"`
 		LastError      string         `json:"lastError,omitempty"`
-		EvaluationTime float64        `json:"evaluationTime"`
-		LastEvaluation time.Time      `json:"lastEvaluation"`
 		State          string         `json:"state"`
+		Alerts         []*Alert       `json:"alerts"`
+		Duration       float64        `json:"duration"`
+		EvaluationTime float64        `json:"evaluationTime"`
 	}{}
 	if err := json.Unmarshal(b, &rule); err != nil {
 		return err
@@ -796,13 +796,13 @@ func (r *RecordingRule) UnmarshalJSON(b []byte) error {
 	}
 
 	rule := struct {
+		LastEvaluation time.Time      `json:"lastEvaluation"`
+		Labels         model.LabelSet `json:"labels,omitempty"`
 		Name           string         `json:"name"`
 		Query          string         `json:"query"`
-		Labels         model.LabelSet `json:"labels,omitempty"`
 		Health         RuleHealth     `json:"health"`
 		LastError      string         `json:"lastError,omitempty"`
 		EvaluationTime float64        `json:"evaluationTime"`
-		LastEvaluation time.Time      `json:"lastEvaluation"`
 	}{}
 	if err := json.Unmarshal(b, &rule); err != nil {
 		return err
@@ -820,8 +820,8 @@ func (r *RecordingRule) UnmarshalJSON(b []byte) error {
 
 func (qr *queryResult) UnmarshalJSON(b []byte) error {
 	v := struct {
-		Type   model.ValueType `json:"resultType"`
 		Result json.RawMessage `json:"result"`
+		Type   model.ValueType `json:"resultType"`
 	}{}
 
 	err := json.Unmarshal(b, &v)
 
@@ -29,8 +29,8 @@ type Middleware interface {
 }
 
 type middleware struct {
-	buckets  []float64
 	registry prometheus.Registerer
+	buckets  []float64
 }
 
 // WrapHandler wraps the given HTTP handler for instrumentation:
 
@@ -101,22 +101,22 @@ func NewCounter(opts CounterOpts) Counter {
 }
 
 type counter struct {
+	selfCollector
+	exemplar atomic.Value // Containing nil or a *dto.Exemplar.
+
+	desc *Desc
+
+	createdTs *timestamppb.Timestamp
+
+	// now is for testing purposes, by default it's time.Now.
+	now        func() time.Time
+	labelPairs []*dto.LabelPair
 	// valBits contains the bits of the represented float64 value, while
 	// valInt stores values that are exact integers. Both have to go first
 	// in the struct to guarantee alignment for atomic operations.
 	// http://golang.org/pkg/sync/atomic/#pkg-note-BUG
 	valBits uint64
 	valInt  uint64
-
-	selfCollector
-	desc *Desc
-
-	createdTs  *timestamppb.Timestamp
-	labelPairs []*dto.LabelPair
-	exemplar   atomic.Value // Containing nil or a *dto.Exemplar.
-
-	// now is for testing purposes, by default it's time.Now.
-	now func() time.Time
 }
 
 func (c *counter) Desc() *Desc {
 
@@ -43,16 +43,19 @@ import (
 //
 // Use NewDesc to create new Desc instances.
 type Desc struct {
+	// err is an error that occurred during construction. It is reported on
+	// registration time.
+	err error
+	// variableLabels contains names of labels and normalization function for
+	// which the metric maintains variable values.
+	variableLabels *compiledLabels
 	// fqName has been built from Namespace, Subsystem, and Name.
 	fqName string
 	// help provides some helpful information about this metric.
 	help string
 	// constLabelPairs contains precalculated DTO label pairs based on
 	// the constant labels.
 	constLabelPairs []*dto.LabelPair
-	// variableLabels contains names of labels and normalization function for
-	// which the metric maintains variable values.
-	variableLabels *compiledLabels
 	// id is a hash of the values of the ConstLabels and fqName. This
 	// must be unique among all registered descriptors and can therefore be
 	// used as an identifier of the descriptor.
@@ -61,9 +64,6 @@ type Desc struct {
 	// Help string. Each Desc with the same fqName must have the same
 	// dimHash.
 	dimHash uint64
-	// err is an error that occurred during construction. It is reported on
-	// registration time.
-	err error
 }
 
 // NewDesc allocates and initializes a new Desc. Errors are recorded in the Desc
 
@@ -88,15 +88,14 @@ func NewGauge(opts GaugeOpts) Gauge {
 }
 
 type gauge struct {
-	// valBits contains the bits of the represented float64 value. It has
-	// to go first in the struct to guarantee alignment for atomic
-	// operations.  http://golang.org/pkg/sync/atomic/#pkg-note-BUG
-	valBits uint64
-
 	selfCollector
 
 	desc       *Desc
 	labelPairs []*dto.LabelPair
+	// valBits contains the bits of the represented float64 value. It has
+	// to go first in the struct to guarantee alignment for atomic
+	// operations.  http://golang.org/pkg/sync/atomic/#pkg-note-BUG
+	valBits uint64
 }
 
 func (g *gauge) Desc() *Desc {
 
@@ -94,19 +94,17 @@ func bestEffortLookupRM(lookup []string) []metrics.Description {
 type goCollector struct {
 	base baseGoCollector
 
-	// mu protects updates to all fields ensuring a consistent
-	// snapshot is always produced by Collect.
-	mu sync.Mutex
+	// sampleMap allows lookup for MemStats metrics and runtime/metrics histograms for exact sums.
+	sampleMap map[string]*metrics.Sample
+
+	rmExactSumMapForHist map[string]string
 
 	// Contains all samples that has to retrieved from runtime/metrics (not all of them will be exposed).
 	sampleBuf []metrics.Sample
-	// sampleMap allows lookup for MemStats metrics and runtime/metrics histograms for exact sums.
-	sampleMap map[string]*metrics.Sample
 
 	// rmExposedMetrics represents all runtime/metrics package metrics
 	// that were configured to be exposed.
-	rmExposedMetrics     []collectorMetric
-	rmExactSumMapForHist map[string]string
+	rmExposedMetrics []collectorMetric
 
 	// With Go 1.17, the runtime/metrics package was introduced.
 	// From that point on, metric names produced by the runtime/metrics
@@ -115,7 +113,12 @@ type goCollector struct {
 	//
 	// This field exists to export the same values under the old names
 	// as well.
-	msMetrics        memStatsMetrics
+	msMetrics memStatsMetrics
+
+	// mu protects updates to all fields ensuring a consistent
+	// snapshot is always produced by Collect.
+	mu sync.Mutex
+
 	msMetricsEnabled bool
 }
 
@@ -464,17 +467,17 @@ type batchHistogram struct {
 	selfCollector
 
 	// Static fields updated only once.
-	desc   *Desc
-	hasSum bool
+	desc    *Desc
+	buckets []float64 // Inclusive lower bounds, like runtime/metrics.
+	counts  []uint64
+	sum     float64 // Used if hasSum is true.
 
 	// Because this histogram operates in batches, it just uses a
 	// single mutex for everything. updates are always serialized
 	// but Write calls may operate concurrently with updates.
 	// Contention between these two sources should be rare.
-	mu      sync.Mutex
-	buckets []float64 // Inclusive lower bounds, like runtime/metrics.
-	counts  []uint64
-	sum     float64 // Used if hasSum is true.
+	mu     sync.Mutex
+	hasSum bool
 }
 
 // newBatchHistogram creates a new batch histogram value with the given
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ type Middleware interface {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`type middleware struct {`
`32`		`- buckets []float64`
`33`	`32`	`registry prometheus.Registerer`
	`33`	`+ buckets []float64`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// WrapHandler wraps the given HTTP handler for instrumentation:`