mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

scrape: remove 'mets' string completely

Browse source 
This makes all usage of maps in scrape.go consistent.

Also remove comment about unsafe strings, since we don't use them any
more in this package.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
This commit is contained in:
Bryan Boreham 2023-01-04 12:05:42 +00:00
parent bec5abc4dc
commit d228d1d9cc
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scrape/scrape.go
View file

@ -916,8 +916,7 @@ type scrapeCache struct {
series map[string]*cacheEntry series map[string]*cacheEntry
// Cache of dropped metric strings and their iteration. The iteration must // Cache of dropped metric strings and their iteration. The iteration must
// be a pointer so we can update it without setting a new entry with an unsafe // be a pointer so we can update it.
// string in addDropped().
droppedSeries map[string]*uint64 droppedSeries map[string]*uint64
// seriesCur and seriesPrev store the labels of series that were seen // seriesCur and seriesPrev store the labels of series that were seen
@ -1021,9 +1020,9 @@ func (c *scrapeCache) addRef(met []byte, ref storage.SeriesRef, lset labels.Labe
c.series[string(met)] = &cacheEntry{ref: ref, lastIter: c.iter, lset: lset, hash: hash} c.series[string(met)] = &cacheEntry{ref: ref, lastIter: c.iter, lset: lset, hash: hash}
} }
func (c *scrapeCache) addDropped(met string) { func (c *scrapeCache) addDropped(met []byte) {
iter := c.iter iter := c.iter
c.droppedSeries[met] = &iter c.droppedSeries[string(met)] = &iter
} }
func (c *scrapeCache) getDropped(met []byte) bool { func (c *scrapeCache) getDropped(met []byte) bool {
@ -1590,7 +1589,6 @@ loop:
var ( var (
ref storage.SeriesRef ref storage.SeriesRef
lset labels.Labels lset labels.Labels
mets string
hash uint64 hash uint64
) )
@ -1601,7 +1599,7 @@ loop:
// Update metadata only if it changed in the current iteration. // Update metadata only if it changed in the current iteration.
updateMetadata(lset, false) updateMetadata(lset, false)
} else { } else {
mets = p.Metric(&lset) p.Metric(&lset)
hash = lset.Hash() hash = lset.Hash()
// Hash label set as it is seen local to the target. Then add target labels // Hash label set as it is seen local to the target. Then add target labels
@ -1610,7 +1608,7 @@ loop:
// The label set may be set to empty to indicate dropping. // The label set may be set to empty to indicate dropping.
if lset.IsEmpty() { if lset.IsEmpty() {
sl.cache.addDropped(mets) sl.cache.addDropped(met)
continue continue
} }