1818package metrics
1919
2020import (
21+ "expvar"
22+ "net/http"
23+ "regexp"
24+ "strings"
2125 "sync"
2226
2327 go_kit_metrics "github.com/go-kit/kit/metrics"
24-
2528 go_kit_expvar "github.com/go-kit/kit/metrics/expvar"
29+ go_kit_prometheus "github.com/go-kit/kit/metrics/prometheus"
30+ stdprometheus "github.com/prometheus/client_golang/prometheus"
31+ "github.com/prometheus/client_golang/prometheus/promhttp"
2632 "github.com/rs/zerolog/log"
2733)
2834
@@ -33,37 +39,49 @@ const (
3339 TimerPrefix = "timer"
3440)
3541
42+ const (
43+ prometheusPackage = "prometheus"
44+ )
45+
46+ // GetHandler returns request handler for provided metrics package type
47+ func GetHandler (packageType string ) http.Handler {
48+ switch packageType {
49+ case prometheusPackage :
50+ return promhttp .Handler ()
51+ default :
52+ // expvar
53+ return expvar .Handler ()
54+ }
55+ }
56+
57+ // Timer is the collection of some timers
58+ type Timer struct {
59+ hits go_kit_metrics.Counter
60+ totalTime go_kit_metrics.Counter
61+ histogram go_kit_metrics.Histogram
62+ }
63+
64+ // Update timer components
65+ func (t * Timer ) Update (delta float64 ) {
66+ t .hits .Add (1 )
67+ t .totalTime .Add (delta )
68+ t .histogram .Observe (delta )
69+ }
70+
3671// Registry initializes expvar metrics registry
3772type Registry struct {
3873 metricsCounterVars map [string ]go_kit_metrics.Counter
3974 metricsGaugeVars map [string ]go_kit_metrics.Gauge
4075 metricsHistogramVars map [string ]go_kit_metrics.Histogram
4176 metricsTimerVars map [string ]* Timer
77+ metricsType string
4278
4379 gaugeLock sync.RWMutex
4480 counterLock sync.RWMutex
4581 histogramLock sync.RWMutex
4682 timerLock sync.RWMutex
4783}
4884
49- // NewRegistry initializes metrics registry
50- func NewRegistry () * Registry {
51-
52- return & Registry {
53- metricsCounterVars : map [string ]go_kit_metrics.Counter {},
54- metricsGaugeVars : map [string ]go_kit_metrics.Gauge {},
55- metricsHistogramVars : map [string ]go_kit_metrics.Histogram {},
56- metricsTimerVars : map [string ]* Timer {},
57- }
58- }
59-
60- // Timer is the collection of some timers
61- type Timer struct {
62- hits go_kit_metrics.Counter
63- totalTime go_kit_metrics.Counter
64- histogram go_kit_metrics.Histogram
65- }
66-
6785// NewTimer constructs Timer
6886func (m * Registry ) NewTimer (key string ) * Timer {
6987 if key == "" {
@@ -81,16 +99,22 @@ func (m *Registry) NewTimer(key string) *Timer {
8199 return m .createTimer (combinedKey )
82100}
83101
84- // Update timer components
85- func (t * Timer ) Update (delta float64 ) {
86- t .hits .Add (1 )
87- t .totalTime .Add (delta )
88- t .histogram .Observe (delta )
102+ // GetCounter gets go-kit expvar Counter
103+ // NewRegistry initializes metrics registry
104+ func NewRegistry (metricsType string ) * Registry {
105+
106+ registry := & Registry {
107+ metricsCounterVars : map [string ]go_kit_metrics.Counter {},
108+ metricsGaugeVars : map [string ]go_kit_metrics.Gauge {},
109+ metricsHistogramVars : map [string ]go_kit_metrics.Histogram {},
110+ metricsTimerVars : map [string ]* Timer {},
111+ metricsType : metricsType ,
112+ }
113+ return registry
89114}
90115
91- // GetCounter gets go-kit expvar Counter
116+ // GetCounter gets go-kit Counter
92117func (m * Registry ) GetCounter (key string ) go_kit_metrics.Counter {
93-
94118 if key == "" {
95119 log .Warn ().Msg ("metrics counter key is empty" )
96120 return nil
@@ -103,13 +127,11 @@ func (m *Registry) GetCounter(key string) go_kit_metrics.Counter {
103127 if val , ok := m .metricsCounterVars [combinedKey ]; ok {
104128 return val
105129 }
106-
107130 return m .createCounter (combinedKey )
108131}
109132
110- // GetGauge gets go-kit expvar Gauge
133+ // GetGauge gets go-kit Gauge
111134func (m * Registry ) GetGauge (key string ) go_kit_metrics.Gauge {
112-
113135 if key == "" {
114136 log .Warn ().Msg ("metrics gauge key is empty" )
115137 return nil
@@ -127,9 +149,8 @@ func (m *Registry) GetGauge(key string) go_kit_metrics.Gauge {
127149
128150// GetHistogram gets go-kit Histogram
129151func (m * Registry ) GetHistogram (key string ) go_kit_metrics.Histogram {
130-
131152 if key == "" {
132- log .Warn ().Msg ("metrics gauge key is empty" )
153+ log .Warn ().Msg ("metrics histogram key is empty" )
133154 return nil
134155 }
135156
@@ -141,25 +162,52 @@ func (m *Registry) GetHistogram(key string) go_kit_metrics.Histogram {
141162 return m .createHistogram (key )
142163}
143164
144- func (m * Registry ) createGauge (key string ) * go_kit_expvar.Gauge {
145- gaugeVar := go_kit_expvar .NewGauge (key )
165+ func (m * Registry ) createGauge (key string ) (gaugeVar go_kit_metrics.Gauge ) {
166+ // This is required since naming convention for every package differs
167+ name := m .getPackageSupportedName (key )
168+ switch m .metricsType {
169+ case prometheusPackage :
170+ gaugeVar = go_kit_prometheus .NewGaugeFrom (stdprometheus.GaugeOpts {
171+ Name : name ,
172+ }, []string {})
173+ default :
174+ // Default expvar
175+ gaugeVar = go_kit_expvar .NewGauge (name )
176+ }
146177 m .metricsGaugeVars [key ] = gaugeVar
147- return gaugeVar
148-
178+ return
149179}
150180
151- func (m * Registry ) createCounter (key string ) * go_kit_expvar.Counter {
152- counterVar := go_kit_expvar .NewCounter (key )
181+ func (m * Registry ) createCounter (key string ) (counterVar go_kit_metrics.Counter ) {
182+ // This is required since naming convention for every package differs
183+ name := m .getPackageSupportedName (key )
184+ switch m .metricsType {
185+ case prometheusPackage :
186+ counterVar = go_kit_prometheus .NewCounterFrom (stdprometheus.CounterOpts {
187+ Name : name ,
188+ }, []string {})
189+ default :
190+ // Default expvar
191+ counterVar = go_kit_expvar .NewCounter (name )
192+ }
153193 m .metricsCounterVars [key ] = counterVar
154- return counterVar
155-
194+ return
156195}
157196
158- func (m * Registry ) createHistogram (key string ) * go_kit_expvar.Histogram {
159- histogramVar := go_kit_expvar .NewHistogram (key , 50 )
197+ func (m * Registry ) createHistogram (key string ) (histogramVar go_kit_metrics.Histogram ) {
198+ // This is required since naming convention for every package differs
199+ name := m .getPackageSupportedName (key )
200+ switch m .metricsType {
201+ case prometheusPackage :
202+ histogramVar = go_kit_prometheus .NewHistogramFrom (stdprometheus.HistogramOpts {
203+ Name : name ,
204+ }, []string {})
205+ default :
206+ // Default expvar
207+ histogramVar = go_kit_expvar .NewHistogram (name , 50 )
208+ }
160209 m .metricsHistogramVars [key ] = histogramVar
161- return histogramVar
162-
210+ return
163211}
164212
165213func (m * Registry ) createTimer (key string ) * Timer {
@@ -168,8 +216,33 @@ func (m *Registry) createTimer(key string) *Timer {
168216 totalTime : m .createCounter (key + ".responseTime" ),
169217 histogram : m .createHistogram (key + ".responseTimeHist" ),
170218 }
171-
172219 m .metricsTimerVars [key ] = timerVar
173220 return timerVar
221+ }
174222
223+ // getPackageSupportedName converts name to package supported type
224+ func (m * Registry ) getPackageSupportedName (name string ) string {
225+ switch m .metricsType {
226+ case prometheusPackage :
227+ // https://prometheus.io/docs/practices/naming/
228+ return toSnakeCase (name )
229+ default :
230+ // Default expvar
231+ return name
232+ }
233+ }
234+
235+ func toSnakeCase (name string ) string {
236+ v := strings .Replace (name , "-" , "_" , - 1 )
237+ strArray := strings .Split (v , "." )
238+ var matchFirstCap = regexp .MustCompile ("(.)([A-Z][a-z]+)" )
239+ var matchAllCap = regexp .MustCompile ("([a-z0-9])([A-Z])" )
240+ convertedArray := []string {}
241+
242+ for _ , v := range strArray {
243+ snake := matchFirstCap .ReplaceAllString (v , "${1}_${2}" )
244+ snake = matchAllCap .ReplaceAllString (snake , "${1}_${2}" )
245+ convertedArray = append (convertedArray , strings .ToLower (snake ))
246+ }
247+ return strings .Join (convertedArray , "_" )
175248}
0 commit comments