Fix stats after dataplane update

Thibault Gilles · Thibault Gilles · commit 969b934115a5 · 2019-08-13T10:32:12.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/haproxy-connect
+/haproxy-connect
+/haproxy-consul-connect
diff --git a/go.mod b/go.mod
@@ -5,15 +5,14 @@ go 1.12
 require (
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/criteo/haproxy-spoe-go v0.0.0-20190701135820-6e37602c179b
-	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/go-openapi/analysis v0.19.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.0 // indirect
 	github.com/go-openapi/jsonreference v0.19.0 // indirect
 	github.com/go-openapi/loads v0.19.0 // indirect
 	github.com/go-openapi/runtime v0.19.0 // indirect
 	github.com/go-openapi/spec v0.19.0 // indirect
-	github.com/haproxytech/models v1.0.1
+	github.com/haproxytech/models v1.2.0
 	github.com/hashicorp/consul v1.5.1
 	github.com/hashicorp/consul/api v1.1.0
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
diff --git a/go.sum b/go.sum
@@ -198,6 +198,8 @@ github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc
 github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
 github.com/haproxytech/models v1.0.1 h1:Eh3YXsec8zZWiabMWreXWLcg2/wKCnYOQcal07A/2MI=
 github.com/haproxytech/models v1.0.1/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
+github.com/haproxytech/models v1.2.0 h1:E9C6LPxYgd9VfeCbV+UkmJUnsgw006PZSFjIpWUgO5A=
+github.com/haproxytech/models v1.2.0/go.mod h1:UXZVErm/XN6z10sM/enmxrdeEnwo7vz1JI+a8ycEvOQ=
 github.com/hashicorp/consul v1.5.1 h1:p7tRmQ4m3ZMYkGQkuyjLXKbdU1weeumgZFqZOvw7o4c=
 github.com/hashicorp/consul v1.5.1/go.mod h1:QsmgXh2YA9Njv6y3/FHXqHYhsMye++3oBoAZ6SR8R8I=
 github.com/hashicorp/consul/api v1.1.0 h1:BNQPM9ytxj6jbjjdRPioQ94T6YXriSopn0i8COv6SRA=
diff --git a/haproxy/dataplane.go b/haproxy/dataplane.go
@@ -58,8 +58,8 @@ func (c *dataplaneClient) Ping() error {
 	return c.makeReq(http.MethodGet, "/v1/specification", nil, nil)
 }
 
-func (c *dataplaneClient) Stats() ([]models.NativeStat, error) {
-	res := []models.NativeStat{}
+func (c *dataplaneClient) Stats() (models.NativeStats, error) {
+	res := models.NativeStats{}
 	return res, c.makeReq(http.MethodGet, "/v1/services/haproxy/stats/native", nil, &res)
 }
 
diff --git a/haproxy/stats.go b/haproxy/stats.go
@@ -83,12 +83,14 @@ func (s *Stats) Run() {
 			log.Error(err)
 			continue
 		}
-		s.handle(stats)
+		for _, stat := range stats {
+			s.handle(stat)
+		}
 	}
 }
 
-func (s *Stats) handle(stats []models.NativeStat) {
-	for _, stats := range stats {
+func (s *Stats) handle(stats *models.NativeStatsCollection) {
+	for _, stats := range stats.Stats {
 		switch stats.Type {
 		case models.NativeStatTypeFrontend:
 			s.handleFrontend(stats)
@@ -107,7 +109,7 @@ func statVal(i *int64) float64 {
 	return float64(*i)
 }
 
-func (s *Stats) handleFrontend(stats models.NativeStat) {
+func (s *Stats) handleFrontend(stats *models.NativeStat) {
 	targetService := strings.TrimPrefix(stats.Name, "front_")
 
 	if targetService == "downstream" {
@@ -137,7 +139,7 @@ func (s *Stats) handleFrontend(stats models.NativeStat) {
 	}
 }
 
-func (s *Stats) handlebackend(stats models.NativeStat) {
+func (s *Stats) handlebackend(stats *models.NativeStat) {
 	targetService := strings.TrimPrefix(stats.Name, "back_")
 
 	if targetService == "downstream" {
@@ -147,6 +149,6 @@ func (s *Stats) handlebackend(stats models.NativeStat) {
 	}
 }
 
-func (s *Stats) handleServer(stats models.NativeStat) {
+func (s *Stats) handleServer(stats *models.NativeStat) {
 	resTimeOut.WithLabelValues(s.service, stats.Name).Set(statVal(stats.Stats.Ttime) / 1000)
 }

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-/haproxy-connect`
	`1`	`+/haproxy-connect`
	`2`	`+/haproxy-consul-connect`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,8 @@ func (c *dataplaneClient) Ping() error {`
`58`	`58`	`return c.makeReq(http.MethodGet, "/v1/specification", nil, nil)`
`59`	`59`	`}`
`60`	`60`
`61`		`-func (c *dataplaneClient) Stats() ([]models.NativeStat, error) {`
`62`		`- res := []models.NativeStat{}`
	`61`	`+func (c *dataplaneClient) Stats() (models.NativeStats, error) {`
	`62`	`+ res := models.NativeStats{}`
`63`	`63`	`return res, c.makeReq(http.MethodGet, "/v1/services/haproxy/stats/native", nil, &res)`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,14 @@ func (s *Stats) Run() {`
`83`	`83`	`log.Error(err)`
`84`	`84`	`continue`
`85`	`85`	`}`
`86`		`- s.handle(stats)`
	`86`	`+ for _, stat := range stats {`
	`87`	`+ s.handle(stat)`
	`88`	`+ }`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`
`90`		`-func (s *Stats) handle(stats []models.NativeStat) {`
`91`		`- for _, stats := range stats {`
	`92`	`+func (s Stats) handle(stats models.NativeStatsCollection) {`
	`93`	`+ for _, stats := range stats.Stats {`
`92`	`94`	`switch stats.Type {`
`93`	`95`	`case models.NativeStatTypeFrontend:`
`94`	`96`	`s.handleFrontend(stats)`
`@@ -107,7 +109,7 @@ func statVal(i *int64) float64 {`
`107`	`109`	`return float64(*i)`
`108`	`110`	`}`
`109`	`111`
`110`		`-func (s *Stats) handleFrontend(stats models.NativeStat) {`
	`112`	`+func (s Stats) handleFrontend(stats models.NativeStat) {`
`111`	`113`	`targetService := strings.TrimPrefix(stats.Name, "front_")`
`112`	`114`
`113`	`115`	`if targetService == "downstream" {`
`@@ -137,7 +139,7 @@ func (s *Stats) handleFrontend(stats models.NativeStat) {`
`137`	`139`	`}`
`138`	`140`	`}`
`139`	`141`
`140`		`-func (s *Stats) handlebackend(stats models.NativeStat) {`
	`142`	`+func (s Stats) handlebackend(stats models.NativeStat) {`
`141`	`143`	`targetService := strings.TrimPrefix(stats.Name, "back_")`
`142`	`144`
`143`	`145`	`if targetService == "downstream" {`
`@@ -147,6 +149,6 @@ func (s *Stats) handlebackend(stats models.NativeStat) {`
`147`	`149`	`}`
`148`	`150`	`}`
`149`	`151`
`150`		`-func (s *Stats) handleServer(stats models.NativeStat) {`
	`152`	`+func (s Stats) handleServer(stats models.NativeStat) {`
`151`	`153`	`resTimeOut.WithLabelValues(s.service, stats.Name).Set(statVal(stats.Stats.Ttime) / 1000)`
`152`	`154`	`}`