refactor: adapt to Go 1.17 and bundle gaugeVec with syncMap

apache · Jun 19, 2023 · 17cfbc9 · 17cfbc9
1 parent cd3d6dc
commit 17cfbc9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 27 deletions.
diff --git a/metrics/prometheus/metric_set.go b/metrics/prometheus/metric_set.go
@@ -19,7 +19,6 @@ package prometheus
 
 import (
  "strings"
- "sync"
 )
 
 import (
@@ -44,8 +43,7 @@ type metricSet struct {
  // The number of requests successfully received by the provider
  providerRequestsSucceedTotalCounterVec *prometheus.CounterVec
 
- providerRTMillisecondsMinGaugeVec *prometheus.GaugeVec
- providerRTMillisecondsMinSyncMap *sync.Map
+ providerRTMillisecondsMinGaugeVecWithSyncMap *GaugeVecWithSyncMap
 
  // report the consumer-side's request total counter data
  consumerRequestsTotalCounterVec *prometheus.CounterVec
@@ -54,8 +52,7 @@ type metricSet struct {
  // The number of successful requests sent by consumers
  consumerRequestsSucceedTotalCounterVec *prometheus.CounterVec
 
- consumerRTMillisecondsMinGaugeVec *prometheus.GaugeVec
- consumerRTMillisecondsMinSyncMap *sync.Map
+ consumerRTMillisecondsMinGaugeVecWithSyncMap *GaugeVecWithSyncMap
 }
 
 var labelNames = []string{applicationNameKey, groupKey, hostnameKey, interfaceKey, ipKey, methodKey, versionKey}
@@ -70,10 +67,8 @@ func (ms *metricSet) initAndRegister(reporterConfig *metrics.ReporterConfig) {
  ms.providerRequestsProcessingTotalGaugeVec = newAutoGaugeVec(buildMetricsName(providerField, requestsField, processingField, totalField), reporterConfig.Namespace, labelNames)
  ms.consumerRequestsSucceedTotalCounterVec = newAutoCounterVec(buildMetricsName(consumerField, requestsField, succeedField, totalField), reporterConfig.Namespace, labelNames)
  ms.providerRequestsSucceedTotalCounterVec = newAutoCounterVec(buildMetricsName(providerField, requestsField, succeedField, totalField), reporterConfig.Namespace, labelNames)
- ms.consumerRTMillisecondsMinGaugeVec = newAutoGaugeVec(buildMetricsName(consumerField, rtField, milliSecondsField, minField), reporterConfig.Namespace, labelNames)
- ms.consumerRTMillisecondsMinSyncMap = &sync.Map{}
- ms.providerRTMillisecondsMinGaugeVec = newAutoGaugeVec(buildMetricsName(providerField, rtField, milliSecondsField, minField), reporterConfig.Namespace, labelNames)
- ms.providerRTMillisecondsMinSyncMap = &sync.Map{}
+ ms.consumerRTMillisecondsMinGaugeVecWithSyncMap = newAutoGaugeVecWithSyncMap(buildMetricsName(consumerField, rtField, milliSecondsField, minField), reporterConfig.Namespace, labelNames)
+ ms.providerRTMillisecondsMinGaugeVecWithSyncMap = newAutoGaugeVecWithSyncMap(buildMetricsName(providerField, rtField, milliSecondsField, minField), reporterConfig.Namespace, labelNames)
 }
 
 func buildMetricsName(args ...string) string {

diff --git a/metrics/prometheus/reporter.go b/metrics/prometheus/reporter.go
@@ -149,17 +149,10 @@ func (reporter *PrometheusReporter) incRequestsSucceedTotalCounterVec(role strin
 }
 
 func (reporter *PrometheusReporter) updateRTMillisecondsMinGaugeVec(role string, labels *prometheus.Labels, costMs int64) {
- var gaugeVec *prometheus.GaugeVec
- var m *sync.Map
-
  switch role {
  case providerField:
- gaugeVec = reporter.providerRTMillisecondsMinGaugeVec
- m = reporter.providerRTMillisecondsMinSyncMap
+ go reporter.providerRTMillisecondsMinGaugeVecWithSyncMap.updateMin(labels, costMs)
  case consumerField:
- gaugeVec = reporter.consumerRTMillisecondsMinGaugeVec
- m = reporter.consumerRTMillisecondsMinSyncMap
+ go reporter.consumerRTMillisecondsMinGaugeVecWithSyncMap.updateMin(labels, costMs)
  }
-
- go updateMin(m, labels, gaugeVec, costMs)
 }
diff --git a/metrics/prometheus/util.go b/metrics/prometheus/util.go
@@ -20,12 +20,25 @@ package prometheus
 import (
  "strings"
  "sync"
+ "sync/atomic"
 )
 
 import (
  "github.com/prometheus/client_golang/prometheus"
 )
 
+type GaugeVecWithSyncMap struct {
+ GaugeVec *prometheus.GaugeVec
+ SyncMap *sync.Map
+}
+
+func newAutoGaugeVecWithSyncMap(name, namespace string, labels []string) *GaugeVecWithSyncMap {
+ return &GaugeVecWithSyncMap{
+ GaugeVec: newAutoGaugeVec(name, namespace, labels),
+ SyncMap: &sync.Map{},
+ }
+}
+
 func convertLabelsToMapKey(labels prometheus.Labels) string {
  return strings.Join([]string{
  labels[applicationNameKey],
@@ -38,24 +51,28 @@ func convertLabelsToMapKey(labels prometheus.Labels) string {
  }, "_")
 }
 
-func updateMin(m *sync.Map, labels *prometheus.Labels, gaugeVec *prometheus.GaugeVec, costMs int64) {
+func (gv *GaugeVecWithSyncMap) updateMin(labels *prometheus.Labels, curValue int64) {
  key := convertLabelsToMapKey(*labels)
+ cur := &atomic.Int64{} // for first store
+ cur.Store(curValue)
  for {
- if actual, loaded := m.LoadOrStore(key, costMs); loaded {
- if costMs < actual.(int64) {
- // need to update
- if m.CompareAndSwap(key, actual, costMs) {
- // value is not changed, update success
- gaugeVec.With(*labels).Set(float64(costMs))
+ if actual, loaded := gv.SyncMap.LoadOrStore(key, cur); loaded {
+ store := actual.(*atomic.Int64)
+ storeValue := store.Load()
+ if curValue < storeValue {
+ if store.CompareAndSwap(storeValue, curValue) {
+ // value is not changed, should update
+ gv.GaugeVec.With(*labels).Set(float64(curValue))
  break
  }
+ // value has changed, continue for loop
  } else {
  // no need to update
  break
  }
  } else {
- // store current costMs as this labels' init value
- gaugeVec.With(*labels).Set(float64(costMs))
+ // store current curValue as this labels' init value
+ gv.GaugeVec.With(*labels).Set(float64(curValue))
  break
  }
  }