Merge pull request #784 from hummerd/master

beorn7 · web-flow · commit c650ae9fa103 · 2020-07-25T00:01:35.000+02:00
Remove reference to Metric after reslicing
diff --git a/prometheus/vec.go b/prometheus/vec.go
@@ -276,7 +276,9 @@ func (m *metricMap) deleteByHashWithLabelValues(
 	}
 
 	if len(metrics) > 1 {
+		old := metrics
 		m.metrics[h] = append(metrics[:i], metrics[i+1:]...)
+		old[len(old)-1] = metricWithLabelValues{}
 	} else {
 		delete(m.metrics, h)
 	}
@@ -302,7 +304,9 @@ func (m *metricMap) deleteByHashWithLabels(
 	}
 
 	if len(metrics) > 1 {
+		old := metrics
 		m.metrics[h] = append(metrics[:i], metrics[i+1:]...)
+		old[len(old)-1] = metricWithLabelValues{}
 	} else {
 		delete(m.metrics, h)
 	}

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,9 @@ func (m *metricMap) deleteByHashWithLabelValues(`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`if len(metrics) > 1 {`
	`279`	`+ old := metrics`
`279`	`280`	`m.metrics[h] = append(metrics[:i], metrics[i+1:]...)`
	`281`	`+ old[len(old)-1] = metricWithLabelValues{}`
`280`	`282`	`} else {`
`281`	`283`	`delete(m.metrics, h)`
`282`	`284`	`}`
`@@ -302,7 +304,9 @@ func (m *metricMap) deleteByHashWithLabels(`
`302`	`304`	`}`
`303`	`305`
`304`	`306`	`if len(metrics) > 1 {`
	`307`	`+ old := metrics`
`305`	`308`	`m.metrics[h] = append(metrics[:i], metrics[i+1:]...)`
	`309`	`+ old[len(old)-1] = metricWithLabelValues{}`
`306`	`310`	`} else {`
`307`	`311`	`delete(m.metrics, h)`
`308`	`312`	`}`