44 "fmt"
55 "time"
66
7+ "github.com/google/uuid"
78 "github.com/prometheus/client_golang/prometheus"
89 "github.com/prometheus/common/log"
910 "github.com/showwin/speedtest-go/speedtest"
@@ -17,29 +18,29 @@ var (
1718 up = prometheus .NewDesc (
1819 prometheus .BuildFQName (namespace , "" , "up" ),
1920 "Was the last speedtest successful." ,
20- nil , nil ,
21+ [] string { "test_uuid" } , nil ,
2122 )
2223 scrapeDurationSeconds = prometheus .NewDesc (
2324 prometheus .BuildFQName (namespace , "" , "scrape_duration_seconds" ),
2425 "Time to preform last speed test" ,
25- nil , nil ,
26+ [] string { "test_uuid" } , nil ,
2627 )
2728 latency = prometheus .NewDesc (
2829 prometheus .BuildFQName (namespace , "" , "latency_seconds" ),
2930 "Measured latency on last speed test" ,
30- []string {"user_lat" , "user_lon" , "user_ip" , "user_isp" , "server_lat" , "server_lon" , "server_id" , "server_name" , "server_country" , "distance" },
31+ []string {"test_uuid" , " user_lat""user_lon" , "user_ip" , "user_isp" , "server_lat" , "server_lon" , "server_id" , "server_name" , "server_country" , "distance" },
3132 nil ,
3233 )
3334 upload = prometheus .NewDesc (
3435 prometheus .BuildFQName (namespace , "" , "upload_speed_Bps" ),
3536 "Last upload speedtest result" ,
36- []string {"user_lat" , "user_lon" , "user_ip" , "user_isp" , "server_lat" , "server_lon" , "server_id" , "server_name" , "server_country" , "distance" },
37+ []string {"test_uuid" , " user_lat""user_lon" , "user_ip" , "user_isp" , "server_lat" , "server_lon" , "server_id" , "server_name" , "server_country" , "distance" },
3738 nil ,
3839 )
3940 download = prometheus .NewDesc (
4041 prometheus .BuildFQName (namespace , "" , "download_speed_Bps" ),
4142 "Last download speedtest result" ,
42- []string {"user_lat" , "user_lon" , "user_ip" , "user_isp" , "server_lat" , "server_lon" , "server_id" , "server_name" , "server_country" , "distance" },
43+ []string {"test_uuid" , " user_lat""user_lon" , "user_ip" , "user_isp" , "server_lat" , "server_lon" , "server_id" , "server_name" , "server_country" , "distance" },
4344 nil ,
4445 )
4546)
@@ -66,24 +67,28 @@ func (e *Exporter) Describe(ch chan<- *prometheus.Desc) {
6667// as Prometheus metrics. It implements prometheus.Collector.
6768func (e * Exporter ) Collect (ch chan <- prometheus.Metric ) {
6869 start := time .Now ()
69- ok := e .speedtest (ch )
70+ testUUID := uuid .New ().String ()
71+ ok := e .speedtest (testUUID , ch )
7072 d := time .Since (start ).Seconds ()
7173
7274 if ok {
7375 ch <- prometheus .MustNewConstMetric (
7476 up , prometheus .GaugeValue , 1.0 ,
77+ testUUID ,
7578 )
7679 ch <- prometheus .MustNewConstMetric (
7780 scrapeDurationSeconds , prometheus .GaugeValue , d ,
81+ testUUID ,
7882 )
7983 } else {
8084 ch <- prometheus .MustNewConstMetric (
8185 up , prometheus .GaugeValue , 0.0 ,
86+ testUUID ,
8287 )
8388 }
8489}
8590
86- func (e * Exporter ) speedtest (ch chan <- prometheus.Metric ) bool {
91+ func (e * Exporter ) speedtest (testUUID string , ch chan <- prometheus.Metric ) bool {
8792 user , err := speedtest .FetchUserInfo ()
8893 if err != nil {
8994 log .Errorf ("could not fetch user information: %s" , err .Error ())
@@ -100,59 +105,87 @@ func (e *Exporter) speedtest(ch chan<- prometheus.Metric) bool {
100105 servers := serverList .Servers
101106 server := servers [0 ]
102107
103- if err := server .PingTest (); err == nil {
104- ch <- prometheus .MustNewConstMetric (
105- latency , prometheus .GaugeValue , server .Latency .Seconds (),
106- user .Lat ,
107- user .Lon ,
108- user .IP ,
109- user .Isp ,
110- server .Lat ,
111- server .Lon ,
112- server .ID ,
113- server .Name ,
114- server .Country ,
115- fmt .Sprintf ("%f" , server .Distance ),
116- )
117- } else {
108+ ok := pingTest (testUUID , user , server , ch )
109+ ok = downloadTest (testUUID , user , server , ch ) && ok
110+ ok = uploadTest (testUUID , user , server , ch ) && ok
111+
112+ if ok {
113+ return true
114+ }
115+ return false
116+ }
117+
118+ func pingTest (testUUID string , user * speedtest.User , server * speedtest.Server , ch chan <- prometheus.Metric ) bool {
119+ err := server .PingTest ()
120+ if err != nil {
118121 log .Errorf ("failed to carry out ping test: %s" , err .Error ())
122+ return false
119123 }
120124
121- if err := server .DownloadTest (false ); err == nil {
122- ch <- prometheus .MustNewConstMetric (
123- download , prometheus .GaugeValue , server .DLSpeed * 1024 * 1024 ,
124- user .Lat ,
125- user .Lon ,
126- user .IP ,
127- user .Isp ,
128- server .Lat ,
129- server .Lon ,
130- server .ID ,
131- server .Name ,
132- server .Country ,
133- fmt .Sprintf ("%f" , server .Distance ),
134- )
135- } else {
125+ ch <- prometheus .MustNewConstMetric (
126+ latency , prometheus .GaugeValue , server .Latency .Seconds (),
127+ testUUID ,
128+ user .Lat ,
129+ user .Lon ,
130+ user .IP ,
131+ user .Isp ,
132+ server .Lat ,
133+ server .Lon ,
134+ server .ID ,
135+ server .Name ,
136+ server .Country ,
137+ fmt .Sprintf ("%f" , server .Distance ),
138+ )
139+
140+ return true
141+ }
142+
143+ func downloadTest (testUUID string , user * speedtest.User , server * speedtest.Server , ch chan <- prometheus.Metric ) bool {
144+ err := server .DownloadTest (false )
145+ if err != nil {
136146 log .Errorf ("failed to carry out download test: %s" , err .Error ())
147+ return false
137148 }
138149
139- if err := server .UploadTest (false ); err == nil {
140- ch <- prometheus .MustNewConstMetric (
141- upload , prometheus .GaugeValue , server .ULSpeed * 1024 * 1024 ,
142- user .Lat ,
143- user .Lon ,
144- user .IP ,
145- user .Isp ,
146- server .Lat ,
147- server .Lon ,
148- server .ID ,
149- server .Name ,
150- server .Country ,
151- fmt .Sprintf ("%f" , server .Distance ),
152- )
153- } else {
150+ ch <- prometheus .MustNewConstMetric (
151+ download , prometheus .GaugeValue , server .DLSpeed * 1024 * 1024 ,
152+ testUUID ,
153+ user .Lat ,
154+ user .Lon ,
155+ user .IP ,
156+ user .Isp ,
157+ server .Lat ,
158+ server .Lon ,
159+ server .ID ,
160+ server .Name ,
161+ server .Country ,
162+ fmt .Sprintf ("%f" , server .Distance ),
163+ )
164+
165+ return true
166+ }
167+
168+ func uploadTest (testUUID string , user * speedtest.User , server * speedtest.Server , ch chan <- prometheus.Metric ) bool {
169+ err := server .UploadTest (false )
170+ if err != nil {
154171 log .Errorf ("failed to carry out upload test: %s" , err .Error ())
172+ return false
155173 }
156174
175+ ch <- prometheus .MustNewConstMetric (
176+ upload , prometheus .GaugeValue , server .ULSpeed * 1024 * 1024 ,
177+ testUUID ,
178+ user .Lat ,
179+ user .Lon ,
180+ user .IP ,
181+ user .Isp ,
182+ server .Lat ,
183+ server .Lon ,
184+ server .ID ,
185+ server .Name ,
186+ server .Country ,
187+ fmt .Sprintf ("%f" , server .Distance ),
188+ )
189+
157190 return true
158191}
0 commit comments