re
/
client_golang
forked from mirror/client_golang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix race conditions in metric methods 

Methods which expect to use a mutex must be defined for the pointer
value, because mutexes are not copyable.
This commit is contained in:
Bernerd Schaefer 2013-05-03 16:02:03 +02:00
parent 9ba7cdf4cf
commit d4ff2cc87a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
prometheus/counter.go
View File

@ -73,7 +73,7 @@ func (metric *counter) ResetAll() {
} }
} }
func (metric counter) String() string { func (metric *counter) String() string {
formatString := "[Counter %s]" formatString := "[Counter %s]"
metric.mutex.RLock() metric.mutex.RLock()
@ -132,7 +132,7 @@ func (metric *counter) Decrement(labels map[string]string) float64 {
return metric.DecrementBy(labels, 1) return metric.DecrementBy(labels, 1)
} }
func (metric counter) MarshalJSON() ([]byte, error) { func (metric *counter) MarshalJSON() ([]byte, error) {
metric.mutex.RLock() metric.mutex.RLock()
defer metric.mutex.RUnlock() defer metric.mutex.RUnlock()

4
prometheus/gauge.go
View File

@ -37,7 +37,7 @@ type gauge struct {
values map[string]*gaugeVector values map[string]*gaugeVector
} }
func (metric gauge) String() string { func (metric *gauge) String() string {
formatString := "[Gauge %s]" formatString := "[Gauge %s]"
metric.mutex.RLock() metric.mutex.RLock()
@ -80,7 +80,7 @@ func (metric *gauge) ResetAll() {
} }
} }
func (metric gauge) MarshalJSON() ([]byte, error) { func (metric *gauge) MarshalJSON() ([]byte, error) {
metric.mutex.RLock() metric.mutex.RLock()
defer metric.mutex.RUnlock() defer metric.mutex.RUnlock()

4
prometheus/histogram.go
View File

@ -122,7 +122,7 @@ func (h *histogram) Add(labels map[string]string, value float64) {
histogram.buckets[lastIndex].Add(value) histogram.buckets[lastIndex].Add(value)
} }
func (h histogram) String() string { func (h *histogram) String() string {
h.mutex.RLock() h.mutex.RLock()
defer h.mutex.RUnlock() defer h.mutex.RUnlock()
@ -239,7 +239,7 @@ func formatFloat(value float64) string {
return strconv.FormatFloat(value, floatFormat, floatPrecision, floatBitCount) return strconv.FormatFloat(value, floatFormat, floatPrecision, floatBitCount)
} }
func (h histogram) MarshalJSON() ([]byte, error) { func (h *histogram) MarshalJSON() ([]byte, error) {
h.mutex.RLock() h.mutex.RLock()
defer h.mutex.RUnlock() defer h.mutex.RUnlock()