@@ -20,9 +20,10 @@ import (
2020 "net/http"
2121 "strconv"
2222
23+ "github.com/go-kit/kit/log"
24+ "github.com/go-kit/kit/log/level"
2325 "github.com/kawamuray/jsonpath" // Originally: "github.com/NickSardo/jsonpath"
2426 "github.com/prometheus/client_golang/prometheus"
25- log "github.com/sirupsen/logrus"
2627)
2728
2829type JsonGaugeCollector struct {
@@ -32,42 +33,42 @@ type JsonGaugeCollector struct {
3233 LabelsJsonPath map [string ]string
3334}
3435
35- func Scrape (collectors []JsonGaugeCollector , json []byte ) {
36+ func Scrape (logger log. Logger , collectors []JsonGaugeCollector , json []byte ) {
3637
3738 for _ , collector := range collectors {
3839 if collector .ValueJsonPath == "" { // ScrapeType is 'value'
3940
4041 // Since this is a 'value' type metric, there should be exactly one element in results
4142 // If there are more, just return the first one
4243 // TODO: Better handling/logging for this scenario
43- floatValue , err := extractValue (json , collector .KeyJsonPath )
44+ floatValue , err := extractValue (logger , json , collector .KeyJsonPath )
4445 if err != nil {
45- log .Error (err )
46+ level .Error (logger ). Log ( "msg" , "Failed to extract float value for metric" , "path" , collector . KeyJsonPath , "err" , err )
4647 continue
4748 }
4849
49- collector .With (extractLabels (json , collector .LabelsJsonPath )).Set (floatValue )
50+ collector .With (extractLabels (logger , json , collector .LabelsJsonPath )).Set (floatValue )
5051 } else { // ScrapeType is 'object'
5152 path , err := compilePath (collector .KeyJsonPath )
5253 if err != nil {
53- log . Errorf ( " Failed to compile path: '%s', ERROR: '%s'" collector .KeyJsonPath , err )
54+ level . Error ( logger ). Log ( "msg" , " Failed to compile path" , "path" , collector .KeyJsonPath , "err" , err )
5455 continue
5556 }
5657
5758 eval , err := jsonpath .EvalPathsInBytes (json , []* jsonpath.Path {path })
5859 if err != nil {
59- log . Errorf ( " Failed to create evaluator for JSON Path: %s, ERROR: '%s'" collector .KeyJsonPath , err )
60+ level . Error ( logger ). Log ( "msg" , " Failed to create evaluator for json path" , "path" , collector .KeyJsonPath , "err" , err )
6061 continue
6162 }
6263 for {
6364 if result , ok := eval .Next (); ok {
64- floatValue , err := extractValue (result .Value , collector .ValueJsonPath )
65+ floatValue , err := extractValue (logger , result .Value , collector .ValueJsonPath )
6566 if err != nil {
66- log .Error (err )
67+ level .Error (logger ). Log ( "msg" , "Failed to extract value" , "path" , collector . ValueJsonPath , "err" , err )
6768 continue
6869 }
6970
70- collector .With (extractLabels (result .Value , collector .LabelsJsonPath )).Set (floatValue )
71+ collector .With (extractLabels (logger , result .Value , collector .LabelsJsonPath )).Set (floatValue )
7172 } else {
7273 break
7374 }
@@ -91,7 +92,7 @@ func compilePath(path string) (*jsonpath.Path, error) {
9192}
9293
9394// Returns the first matching float value at the given json path
94- func extractValue (json []byte , path string ) (float64 , error ) {
95+ func extractValue (logger log. Logger , json []byte , path string ) (float64 , error ) {
9596 var floatValue = - 1.0
9697 var result * jsonpath.Result
9798 var err error
@@ -117,15 +118,15 @@ func extractValue(json []byte, path string) (float64, error) {
117118 if eval .Error != nil {
118119 return floatValue , fmt .Errorf ("Failed to evaluate json. ERROR: '%s', PATH: '%s', JSON: '%s'" , eval .Error , path , string (json ))
119120 } else {
120- log . Debugf ( "Could not find path. PATH: '%s', JSON: '%s'" path , string (json ))
121+ level . Debug ( logger ). Log ( "msg" , "Path not found" , "path" , path , "json" , string (json ))
121122 return floatValue , fmt .Errorf ("Could not find path. PATH: '%s'" , path )
122123 }
123124 }
124125
125126 return SanitizeValue (result )
126127}
127128
128- func extractLabels (json []byte , l map [string ]string ) map [string ]string {
129+ func extractLabels (logger log. Logger , json []byte , l map [string ]string ) map [string ]string {
129130 labels := make (map [string ]string )
130131 for label , path := range l {
131132
@@ -138,25 +139,25 @@ func extractLabels(json []byte, l map[string]string) map[string]string {
138139 // Dynamic value
139140 p , err := compilePath (path )
140141 if err != nil {
141- log . Errorf ( " Failed to compile path for label: '%s', PATH: '%s', ERROR: '%s'" label , path , err )
142+ level . Error ( logger ). Log ( "msg" , " Failed to compile path for label" , "path" , path , "label" , label , "err" , err )
142143 labels [label ] = ""
143144 continue
144145 }
145146
146147 eval , err := jsonpath .EvalPathsInBytes (json , []* jsonpath.Path {p })
147148 if err != nil {
148- log . Errorf ( " Failed to create evaluator for JSON Path: %s, ERROR: '%s'" path , err )
149+ level . Error ( logger ). Log ( "msg" , " Failed to create evaluator for json" , "path" , path , "err" , err )
149150 labels [label ] = ""
150151 continue
151152 }
152153
153154 result , ok := eval .Next ()
154155 if result == nil || ! ok {
155156 if eval .Error != nil {
156- log . Errorf ( " Failed to evaluate json for label: '%s', ERROR: '%s', PATH: '%s', JSON: '%s'" , label , eval .Error , path , string ( json ) )
157+ level . Error ( logger ). Log ( "msg" , " Failed to evaluate" , " label" , label , "json" , string ( json ), "err" , eval .Error )
157158 } else {
158- log . Debugf ( "Could not find path in json for label: '%s', PATH: '%s', JSON: '%s'" , label , path , string ( json ) )
159- log . Warnf ( "Could not find path in json for label: '%s', PATH: '%s'" label , path )
159+ level . Warn ( logger ). Log ( "msg" , "Label path not found in json" , "path" , path , " label" , label )
160+ level . Debug ( logger ). Log ( "msg" , "Label path not found in json" , "path" , path , "label" , label , "json" , string ( json ) )
160161 }
161162 continue
162163 }
@@ -171,12 +172,12 @@ func extractLabels(json []byte, l map[string]string) map[string]string {
171172 return labels
172173}
173174
174- func FetchJson (ctx context.Context , endpoint string , headers map [string ]string ) ([]byte , error ) {
175+ func FetchJson (ctx context.Context , logger log. Logger , endpoint string , headers map [string ]string ) ([]byte , error ) {
175176 client := & http.Client {}
176177 req , err := http .NewRequest ("GET" , endpoint , nil )
177178 req = req .WithContext (ctx )
178179 if err != nil {
179- log . Errorf ( "Error creating request. ERROR: '%s' "err )
180+ level . Error ( logger ). Log ( "msg" , "Failed to create request" , "err "err )
180181 return nil , err
181182 }
182183
0 commit comments