@@ -13,6 +13,7 @@ import (
1313 "errors"
1414 "fmt"
1515 "strconv"
16+ "strings"
1617 "time"
1718
1819 "github.com/golang/groupcache/lru"
@@ -123,6 +124,14 @@ var (
123124 }, []string {"type" })
124125)
125126
127+ // Collector queries the database to collect custom metrics
128+ type Collector struct {
129+ first bool
130+ config Custom
131+ pool * pgxpool.Pool
132+ logicalIOLast logicalIO
133+ metricsCache * lru.Cache
134+ }
126135type activity struct {
127136 time int64
128137 id string
@@ -140,38 +149,35 @@ type activity struct {
140149 rowsRead * float64
141150}
142151
143- // Collector queries the database to collect custom metrics
144- type Collector struct {
145- first bool
146- config Custom
147- pool * pgxpool.Pool
148- rowArrayLast rowLioSample
149- countCache * lru.Cache
150- }
151- type rowLioSample struct {
152- lioTotal int
153- fullLio int
154- iJoinLio int
155- explicitLio int
156- healthyLio int
152+ type logicalIO struct {
153+ total int
154+ full int
155+ indexJoin int
156+ explicit int
157+ healthy int
157158}
158159
159160// NewCollector creates a new collector for retrieving sql activity from the
160161// internal CRDB tables
161162func NewCollector (ctx context.Context , config Custom ) (* Collector , error ) {
162- poolConfig , err := pgxpool .ParseConfig (config .URL )
163- if err != nil {
164- return nil , err
165- }
163+
166164 var pool * pgxpool.Pool
167165 sleep := 5
168166 for {
169- pool , err = pgxpool .ConnectConfig ( ctx , poolConfig )
167+ poolConfig , err : =pgxpool .ParseConfig ( config . URL )
170168 if err != nil {
169+ log .Error (err )
171170 log .Warnf ("Unable to connect to the db. Retrying in %d seconds" , sleep )
172171 time .Sleep (time .Duration (sleep * int (time .Second )))
173172 } else {
174- break
173+ pool , err = pgxpool .ConnectConfig (ctx , poolConfig )
174+ if err != nil {
175+ log .Error (err )
176+ log .Warnf ("Unable to connect to the db. Retrying in %d seconds" , sleep )
177+ time .Sleep (time .Duration (sleep * int (time .Second )))
178+ } else {
179+ break
180+ }
175181 }
176182 if sleep < 60 {
177183 sleep += 5
@@ -180,11 +186,21 @@ func NewCollector(ctx context.Context, config Custom) (*Collector, error) {
180186 if config .Limit == 0 {
181187 config .Limit = defaultLimit
182188 }
189+ countCache := lru .New (config .Limit * 2 )
190+ countCache .OnEvicted = func (key lru.Key , value interface {}) {
191+ switch k := key .(type ) {
192+ case string :
193+ deleted := requests .DeleteLabelValues (strings .Split (k , "|" )... )
194+ if deleted {
195+ log .Debugf ("%s removed from cache" , k )
196+ }
197+ }
198+ }
183199 return & Collector {
184- first : true ,
185- config : config ,
186- pool : pool ,
187- countCache : lru . New ( config . Limit * 4 ) ,
200+ first : true ,
201+ config : config ,
202+ pool : pool ,
203+ metricsCache : countCache ,
188204 }, nil
189205}
190206
@@ -280,18 +296,16 @@ func (c *Collector) getActivity(ctx context.Context) error {
280296
281297 labels := []string {r .id , r .app , r .database }
282298 key := r .id + "|" + r .app + "|" + r .database
283- if cached , ok := c .countCache .Get (key ); ok {
284- lastCount := cached .(int64 )
285- if r .cnt >= lastCount {
286- requests .WithLabelValues (labels ... ).Add (float64 (r .cnt - lastCount ))
299+ log .Tracef ("key:%s" , key )
300+ if cached , ok := c .metricsCache .Get (key ); ok {
301+ last := cached .(* activity )
302+ if r .cnt > last .cnt {
303+ requests .WithLabelValues (labels ... ).Add (float64 (r .cnt - last .cnt ))
287304 }
288- // } else {
289- // requests.WithLabelValues(labels...).Add(float64(r.cnt))
290- // }
291305 } else if ! c .first {
292306 requests .WithLabelValues (labels ... ).Add (float64 (r .cnt ))
293307 }
294- c .countCache .Add (key , r . cnt )
308+ c .metricsCache .Add (key , r )
295309 if r .maxDiskUsage != nil {
296310 maxDiskUsage .WithLabelValues (labels ... ).Set (* r .maxDiskUsage )
297311 }
@@ -320,7 +334,7 @@ func (c *Collector) getActivity(ctx context.Context) error {
320334 contTime .WithLabelValues (labels ... ).Set (* r .contTime )
321335 }
322336 }
323- log .Tracef ("Cache len:%d" , c .countCache .Len ())
337+ log .Tracef ("Cache len:%d" , c .metricsCache .Len ())
324338 return nil
325339}
326340
@@ -346,27 +360,27 @@ func (c *Collector) getEfficiency(ctx context.Context) error {
346360 defer rows .Close ()
347361
348362 for rows .Next () {
349- rowArray := rowLioSample {}
350- err := rows .Scan (& rowArray . lioTotal , & rowArray . fullLio , & rowArray . iJoinLio , & rowArray . explicitLio , & rowArray . healthyLio )
363+ lio := & logicalIO {}
364+ err := rows .Scan (& lio . total , & lio . full , & lio . indexJoin , & lio . explicit , & lio . healthy )
351365 if err != nil {
352366 log .Tracef ("getEfficiency Scan %s" , err .Error ())
353367 return err
354368 }
355369 log .Debugf ("time:%d, explicitTotal:%d, adding: %f" ,
356370 time .Now ().Unix (),
357- rowArray . explicitLio ,
358- noNegVals (rowArray . explicitLio , c .rowArrayLast . explicitLio ))
371+ lio . explicit ,
372+ noNegVals (lio . explicit , c .logicalIOLast . explicit ))
359373 if ! c .first {
360- stmtStats .WithLabelValues ("full" ).Add (noNegVals (rowArray . fullLio , c .rowArrayLast . fullLio ))
361- stmtStats .WithLabelValues ("ijoin" ).Add (noNegVals (rowArray . iJoinLio , c .rowArrayLast . iJoinLio ))
362- stmtStats .WithLabelValues ("explicit" ).Add (noNegVals (rowArray . explicitLio , c .rowArrayLast . explicitLio ))
363- stmtStats .WithLabelValues ("optimized" ).Add (noNegVals (rowArray . healthyLio , c .rowArrayLast . healthyLio ))
374+ stmtStats .WithLabelValues ("full" ).Add (noNegVals (lio . full , c .logicalIOLast . full ))
375+ stmtStats .WithLabelValues ("ijoin" ).Add (noNegVals (lio . indexJoin , c .logicalIOLast . indexJoin ))
376+ stmtStats .WithLabelValues ("explicit" ).Add (noNegVals (lio . explicit , c .logicalIOLast . explicit ))
377+ stmtStats .WithLabelValues ("optimized" ).Add (noNegVals (lio . healthy , c .logicalIOLast . healthy ))
364378 }
365- c .rowArrayLast . lioTotal = rowArray . lioTotal
366- c .rowArrayLast . fullLio = rowArray . fullLio
367- c .rowArrayLast . iJoinLio = rowArray . iJoinLio
368- c .rowArrayLast . explicitLio = rowArray . explicitLio
369- c .rowArrayLast . healthyLio = rowArray . healthyLio
379+ c .logicalIOLast . total = lio . total
380+ c .logicalIOLast . full = lio . full
381+ c .logicalIOLast . indexJoin = lio . indexJoin
382+ c .logicalIOLast . explicit = lio . explicit
383+ c .logicalIOLast . healthy = lio . healthy
370384 }
371385 return nil
372386}
0 commit comments