@@ -16,13 +16,12 @@ package exporter
1616import (
1717 "crypto/tls"
1818 "errors"
19+ "log/slog"
1920 "net"
2021 "strconv"
2122 "strings"
2223 "time"
2324
24- "github.com/go-kit/log"
25- "github.com/go-kit/log/level"
2625 "github.com/grobie/gomemcache/memcache"
2726 "github.com/prometheus/client_golang/prometheus"
2827)
@@ -39,7 +38,7 @@ var errKeyNotFound = errors.New("key not found")
3938type Exporter struct {
4039 address string
4140 timeout time.Duration
42- logger log .Logger
41+ logger * slog .Logger
4342 tlsConfig * tls.Config
4443
4544 up * prometheus.Desc
@@ -133,7 +132,7 @@ type Exporter struct {
133132}
134133
135134// New returns an initialized exporter.
136- func New (server string , timeout time.Duration , logger log .Logger , tlsConfig * tls.Config ) * Exporter {
135+ func New (server string , timeout time.Duration , logger * slog .Logger , tlsConfig * tls.Config ) * Exporter {
137136 return & Exporter {
138137 address : server ,
139138 timeout : timeout ,
@@ -770,7 +769,7 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
770769 c , err := memcache .New (e .address )
771770 if err != nil {
772771 ch <- prometheus .MustNewConstMetric (e .up , prometheus .GaugeValue , 0 )
773- level . Error ( e .logger ). Log ( "msg" , "Failed to connect to memcached" , "err" , err )
772+ e .logger . Error ( "Failed to connect to memcached" , "err" , err )
774773 return
775774 }
776775 c .Timeout = e .timeout
@@ -779,12 +778,12 @@ func (e *Exporter) Collect(ch chan<- prometheus.Metric) {
779778 up := float64 (1 )
780779 stats , err := c .Stats ()
781780 if err != nil {
782- level . Error ( e .logger ). Log ( "msg" , "Failed to collect stats from memcached" , "err" , err )
781+ e .logger . Error ( "Failed to collect stats from memcached" , "err" , err )
783782 up = 0
784783 }
785784 statsSettings , err := c .StatsSettings ()
786785 if err != nil {
787- level . Error ( e .logger ). Log ( "msg" , "Could not query stats settings" , "err" , err )
786+ e .logger . Error ( "Could not query stats settings" , "err" , err )
788787 up = 0
789788 }
790789
@@ -857,11 +856,11 @@ func (e *Exporter) parseStats(ch chan<- prometheus.Metric, stats map[net.Addr]me
857856 if cas , casErr := sum (s , "cas_misses" , "cas_hits" , "cas_badval" ); casErr == nil {
858857 ch <- prometheus .MustNewConstMetric (e .commands , prometheus .CounterValue , setCmd - cas , "set" , "hit" )
859858 } else {
860- level . Error ( e .logger ). Log ( "msg" , "Failed to parse cas" , "err" , casErr )
859+ e .logger . Error ( "Failed to parse cas" , "err" , casErr )
861860 parseError = casErr
862861 }
863862 } else {
864- level . Error ( e .logger ). Log ( "msg" , "Failed to parse set" , "err" , err )
863+ e .logger . Error ( "Failed to parse set" , "err" , err )
865864 parseError = err
866865 }
867866
@@ -973,11 +972,11 @@ func (e *Exporter) parseStats(ch chan<- prometheus.Metric, stats map[net.Addr]me
973972 if slabCas , slabCasErr := sum (v , "cas_hits" , "cas_badval" ); slabCasErr == nil {
974973 ch <- prometheus .MustNewConstMetric (e .slabsCommands , prometheus .CounterValue , slabSetCmd - slabCas , slab , "set" , "hit" )
975974 } else {
976- level . Error ( e .logger ). Log ( "msg" , "Failed to parse cas" , "err" , slabCasErr )
975+ e .logger . Error ( "Failed to parse cas" , "err" , slabCasErr )
977976 parseError = slabCasErr
978977 }
979978 } else {
980- level . Error ( e .logger ). Log ( "msg" , "Failed to parse set" , "err" , err )
979+ e .logger . Error ( "Failed to parse set" , "err" , err )
981980 parseError = err
982981 }
983982
@@ -1038,7 +1037,7 @@ func (e *Exporter) parseTimevalAndNewMetric(ch chan<- prometheus.Metric, desc *p
10381037 return e .extractValueAndNewMetric (ch , desc , valueType , parseTimeval , stats , key , labelValues ... )
10391038}
10401039
1041- func (e * Exporter ) extractValueAndNewMetric (ch chan <- prometheus.Metric , desc * prometheus.Desc , valueType prometheus.ValueType , f func (map [string ]string , string , log .Logger ) (float64 , error ), stats map [string ]string , key string , labelValues ... string ) error {
1040+ func (e * Exporter ) extractValueAndNewMetric (ch chan <- prometheus.Metric , desc * prometheus.Desc , valueType prometheus.ValueType , f func (map [string ]string , string , * slog .Logger ) (float64 , error ), stats map [string ]string , key string , labelValues ... string ) error {
10421041 v , err := f (stats , key , e .logger )
10431042 if err == errKeyNotFound {
10441043 return nil
@@ -1051,25 +1050,25 @@ func (e *Exporter) extractValueAndNewMetric(ch chan<- prometheus.Metric, desc *p
10511050 return nil
10521051}
10531052
1054- func parse (stats map [string ]string , key string , logger log .Logger ) (float64 , error ) {
1053+ func parse (stats map [string ]string , key string , logger * slog .Logger ) (float64 , error ) {
10551054 value , ok := stats [key ]
10561055 if ! ok {
1057- level .Debug (logger ). Log ( "msg" , "Key not found" , "key" , key )
1056+ logger .Debug ("Key not found" , "key" , key )
10581057 return 0 , errKeyNotFound
10591058 }
10601059
10611060 v , err := strconv .ParseFloat (value , 64 )
10621061 if err != nil {
1063- level .Error (logger ). Log ( "msg" , "Failed to parse" , "key" , key , "value" , value , "err" , err )
1062+ logger .Error ("Failed to parse" , "key" , key , "value" , value , "err" , err )
10641063 return 0 , err
10651064 }
10661065 return v , nil
10671066}
10681067
1069- func parseBool (stats map [string ]string , key string , logger log .Logger ) (float64 , error ) {
1068+ func parseBool (stats map [string ]string , key string , logger * slog .Logger ) (float64 , error ) {
10701069 value , ok := stats [key ]
10711070 if ! ok {
1072- level .Debug (logger ). Log ( "msg" , "Key not found" , "key" , key )
1071+ logger .Debug ("Key not found" , "key" , key )
10731072 return 0 , errKeyNotFound
10741073 }
10751074
@@ -1079,33 +1078,33 @@ func parseBool(stats map[string]string, key string, logger log.Logger) (float64,
10791078 case "no" :
10801079 return 0 , nil
10811080 default :
1082- level .Error (logger ). Log ( "msg" , "Failed to parse" , "key" , key , "value" , value )
1081+ logger .Error ("Failed to parse" , "key" , key , "value" , value )
10831082 return 0 , errors .New ("failed parse a bool value" )
10841083 }
10851084}
10861085
1087- func parseTimeval (stats map [string ]string , key string , logger log .Logger ) (float64 , error ) {
1086+ func parseTimeval (stats map [string ]string , key string , logger * slog .Logger ) (float64 , error ) {
10881087 value , ok := stats [key ]
10891088 if ! ok {
1090- level .Debug (logger ). Log ( "msg" , "Key not found" , "key" , key )
1089+ logger .Debug ("Key not found" , "key" , key )
10911090 return 0 , errKeyNotFound
10921091 }
10931092 values := strings .Split (value , "." )
10941093
10951094 if len (values ) != 2 {
1096- level .Error (logger ). Log ( "msg" , "Failed to parse" , "key" , key , "value" , value )
1095+ logger .Error ("Failed to parse" , "key" , key , "value" , value )
10971096 return 0 , errors .New ("failed parse a timeval value" )
10981097 }
10991098
11001099 seconds , err := strconv .ParseFloat (values [0 ], 64 )
11011100 if err != nil {
1102- level .Error (logger ). Log ( "msg" , "Failed to parse" , "key" , key , "value" , value , "err" , err )
1101+ logger .Error ("Failed to parse" , "key" , key , "value" , value , "err" , err )
11031102 return 0 , errors .New ("failed parse a timeval value" )
11041103 }
11051104
11061105 microseconds , err := strconv .ParseFloat (values [1 ], 64 )
11071106 if err != nil {
1108- level .Error (logger ). Log ( "msg" , "Failed to parse" , "key" , key , "value" , value , "err" , err )
1107+ logger .Error ("Failed to parse" , "key" , key , "value" , value , "err" , err )
11091108 return 0 , errors .New ("failed parse a timeval value" )
11101109 }
11111110
0 commit comments