Formatting

SingleInflight is now a noop in the dns package, so we have to
implement it ourselves. I've found that dnsmasq just times out when
sending all the questions together.

collector/collector.go

@@ -159,9 +159,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
 			"servers.bind.",
 		}
 
-		responses := make([]dns.RR, len(questions))
+		for _, q := range questions {
-
-		for i, q := range questions {
 			msg := &dns.Msg{
 				MsgHdr: dns.MsgHdr{
 					Id:               dns.Id(),
@@ -177,10 +175,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
 				return err
 			}
 
-			responses[i] = in.Answer[0]
+			for _, a := range in.Answer {
-		}
-
-		for _, a := range responses {
 				txt, ok := a.(*dns.TXT)
 				if !ok {
 					continue
@@ -218,6 +213,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
 					ch <- prometheus.MustNewConstMetric(g, prometheus.GaugeValue, f)
 				}
 			}
+		}
 		return nil
 	})
 

dnsmasq.go

@@ -23,8 +23,8 @@ import (
 	"github.com/google/dnsmasq_exporter/collector"
 	"github.com/miekg/dns"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/client_golang/prometheus/collectors/version"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 )
 
 var (