Skip to content

Commit ee81075

Browse files
author
Hagai Barel
committed
Clenaup and refactor the http methods
1 parent d7e27a8 commit ee81075

File tree

4 files changed

+45
-52
lines changed

4 files changed

+45
-52
lines changed

‎Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ GO ?= GO111MODULE=$(GO111MODULE) go
1010
all: test build ## Run tests and build the binary
1111

1212
init:
13-
@echo ">> running go mod download and tidy"
13+
@echo ">> running go mod download"
1414
$(GO) mod download
15-
$(GO) mod tidy
1615

1716
fmt: init ## Format code using go fmt
1817
@echo ">> formatting code"
@@ -34,11 +33,12 @@ docker: build ## Build docker image
3433
@echo ">> building docker image"
3534
@docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" .
3635

37-
run-local: ## Start a local emq container for development
36+
local: ## Start a local emq container for development
37+
@echo ">> starting emqx container"
3838
@docker run --rm -d --name emqx -h emqx -p 18083:18083 -p 8080:8080 emqx/emqx:latest
3939

40-
run: build run-local ## Run the exporter locally using a local container
41-
./bin/emq_exporter --emq.uri="http://127.0.0.1:18083" --emq.node="emqx@$(IP)" --emq.api-version="v3" --log.level="debug"
40+
run: build local ## Run the exporter locally using a local container
41+
./bin/emq_exporter --emq.node="emqx@$(IP)" --emq.api-version="v3" --log.level="debug"
4242

4343
help: ## Print this message and exit
4444
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%-20s %s\n", $$1, $$2}'

‎emq_exporter.go

+37-44
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package main
22

33
import (
4-
"bytes"
54
"encoding/json"
65
"fmt"
7-
"io"
86
"net/http"
97
"strconv"
108
"strings"
@@ -35,6 +33,11 @@ var (
3533
"node_stats": "/api/v3/nodes/%s/stats/",
3634
"nodes": "/api/v3/nodes/%s",
3735
}
36+
37+
//GitTag stands for a git tag, populated at build time
38+
GitTag string
39+
//GitCommit stands for a git commit hash populated at build time
40+
GitCommit string
3841
)
3942

4043
type metric struct {
@@ -49,11 +52,11 @@ type emqResponse struct {
4952
Data map[string]interface{} `json:"data,omitempty"` //api v3 json key
5053
}
5154

52-
// Exporter collects EMQ stats from the given URI and exports them using
55+
// Exporter collects EMQ stats from the given host and exports them using
5356
// the prometheus metrics package.
5457
type Exporter struct {
55-
URI string
56-
client http.Client
58+
Host string
59+
client *http.Client
5760
username, password, node string
5861
up prometheus.Gauge
5962
totalScrapes prometheus.Counter
@@ -63,15 +66,15 @@ type Exporter struct {
6366
}
6467

6568
// NewExporter returns an initialized Exporter.
66-
func NewExporter(uri, username, password, node string, timeout time.Duration, apiVersion string) (*Exporter, error) {
69+
func NewExporter(uri, username, password, node, apiVersion string, timeout time.Duration) *Exporter {
6770

6871
return &Exporter{
69-
URI: uri,
72+
Host: uri,
7073
username: username,
7174
password: password,
7275
node: node,
7376
apiVersion: apiVersion,
74-
client: http.Client{
77+
client: &http.Client{
7578
Timeout: timeout,
7679
},
7780
up: prometheus.NewGauge(prometheus.GaugeOpts{
@@ -84,7 +87,7 @@ func NewExporter(uri, username, password, node string, timeout time.Duration, ap
8487
Name: "exporter_total_scrapes",
8588
Help: "Current total scrapes.",
8689
}),
87-
}, nil
90+
}
8891

8992
}
9093

@@ -138,19 +141,19 @@ func (e *Exporter) scrape() error {
138141

139142
for name, path := range targets {
140143

141-
resp, err := e.fetch(path)
144+
res, err := e.fetch(path)
142145
if err != nil {
143146
return err
144147
}
145148

146-
if resp.Code != 0 {
149+
if res.Code != 0 {
147150
return fmt.Errorf("Received code != 0")
148151
}
149152

150153
if e.apiVersion == "v2" {
151-
data = resp.Result
154+
data = res.Result
152155
} else {
153-
data = resp.Data
156+
data = res.Data
154157
}
155158

156159
for k, v := range data {
@@ -192,44 +195,45 @@ func (e *Exporter) addMetric(fqName, help string, value float64, labels []string
192195
}
193196

194197
//get the response from the provided target url
195-
func (e *Exporter) fetch(target string) (emqResponse, error) {
196-
var dat emqResponse
198+
func (e *Exporter) fetch(target string) (*emqResponse, error) {
199+
200+
dat := &emqResponse{}
197201

198-
u := e.URI + fmt.Sprintf(target, e.node)
202+
u := e.Host + fmt.Sprintf(target, e.node)
199203

200-
req, err := http.NewRequest("GET", u, nil)
204+
log.Debugln("fetching from", u)
205+
206+
req, err := http.NewRequest(http.MethodGet, u, nil)
201207
if err != nil {
202-
return dat, fmt.Errorf("Failed to get metrics from %s", u)
208+
return dat, fmt.Errorf("Failed to create http request: %v", err)
203209
}
204210

205211
req.SetBasicAuth(e.username, e.password)
212+
req.Header.Set("Accept", "application/json")
213+
req.Header.Set("User-Agent", "emp_exporter/"+GitTag)
214+
206215
res, err := e.client.Do(req)
207216
if err != nil {
208-
return dat, fmt.Errorf("Failed to get metrics from %s", u)
217+
return dat, fmt.Errorf("Failed to get metrics from %s: %v", u, err)
209218
}
210219
defer res.Body.Close()
211220

212221
if res.StatusCode != http.StatusOK {
213-
return dat, fmt.Errorf("Failed to get metrics from %s", u)
222+
return dat, fmt.Errorf("Received status code not ok %s", u)
214223
}
215224

216-
if err := json.Unmarshal(streamToByte(res.Body), &dat); err != nil {
217-
return dat, fmt.Errorf("Failed to unmarshal json")
225+
if err := json.NewDecoder(res.Body).Decode(dat); err != nil {
226+
return dat, fmt.Errorf("Error in json decoder %v", err)
218227
}
219228

220-
return dat, nil
221-
}
229+
//Print the returned response data for debuging
230+
log.Debugf("%#v", *dat)
222231

223-
//Convert a stream into byte array
224-
func streamToByte(stream io.Reader) []byte {
225-
buf := new(bytes.Buffer)
226-
buf.ReadFrom(stream)
227-
return buf.Bytes()
232+
return dat, nil
228233
}
229234

230235
//Try to parse value from string to float64, return error on failure
231236
func parseString(s string) (float64, error) {
232-
233237
v, err := strconv.ParseFloat(s, 64)
234238

235239
if err != nil {
@@ -245,19 +249,11 @@ func parseString(s string) (float64, error) {
245249
return v, nil
246250
}
247251

248-
var (
249-
// GitTag stands for a git tag, populated at build time
250-
GitTag string
251-
// GitCommit stands for a git commit hash populated at build time
252-
GitCommit string
253-
)
254-
255252
func main() {
256-
257253
var (
258254
listenAddress = kingpin.Flag("web.listen-address", "Address to listen on for web interface and telemetry.").Default(":9505").String()
259255
metricsPath = kingpin.Flag("web.telemetry-path", "Path under which to expose metrics.").Default("/metrics").String()
260-
emqURI = kingpin.Flag("emq.uri", "HTTP API address of the EMQ node.").Default("http://127.0.0.1:8080").String()
256+
emqURI = kingpin.Flag("emq.uri", "HTTP API address of the EMQ node.").Default("http://127.0.0.1:18083").String()
261257
emqUsername = kingpin.Flag("emq.username", "EMQ username (or use $EMQ_USERNAME env var)").Default("admin").Envar("EMQ_USERNAME").String()
262258
emqPassword = kingpin.Flag("emq.password", "EMQ password (or use $EMQ_PASSWORD env var)").Default("public").Envar("EMQ_PASSWORD").String()
263259
emqNodeName = kingpin.Flag("emq.node", "Node name of the emq node to scrape.").Default("[email protected]").String()
@@ -272,12 +268,9 @@ func main() {
272268
kingpin.Parse()
273269

274270
log.Infoln("Starting emq_exporter")
275-
log.Infoln(fmt.Sprintf("Version %s (git-%s)", GitTag, GitCommit))
271+
log.Infof("Version %s (git-%s)\n", GitTag, GitCommit)
276272

277-
exporter, err := NewExporter(*emqURI, *emqUsername, *emqPassword, *emqNodeName, *emqTimeout, *emqAPIVersion)
278-
if err != nil {
279-
log.Fatal(err)
280-
}
273+
exporter := NewExporter(*emqURI, *emqUsername, *emqPassword, *emqNodeName, *emqAPIVersion, *emqTimeout)
281274

282275
prometheus.MustRegister(exporter)
283276

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ require (
1616
github.com/sirupsen/logrus v1.2.0 // indirect
1717
golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd // indirect
1818
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
19-
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
19+
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b // indirect
2020
gopkg.in/alecthomas/kingpin.v2 v2.2.6
2121
)

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FY
5050
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5151
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5252
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
53-
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
54-
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
53+
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b h1:MQE+LT/ABUuuvEZ+YQAMSXindAdUh7slEmAkup74op4=
54+
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
5555
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
5656
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5757
gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=

0 commit comments

Comments
 (0)