Merge pull request #27 from soundcloud/grobie/updates

Update dependencies

Author: cagedmantis

.travis.yml

@@ -3,7 +3,7 @@ dist: trusty
 language: go
 
 go:
-  - 1.7
-  
+  - 1.8
+
 script:
   - make

bind/v2/v2.go

@@ -78,35 +78,28 @@ func (c *Client) Stats(...bind.StatisticGroup) (bind.Statistics, error) {
 
 	s.Server.BootTime = stats.Server.BootTime
 	for _, t := range stats.Server.QueriesIn {
-		s.Server.IncomingQueries = append(s.Server.IncomingQueries, counter(t))
+		s.Server.IncomingQueries = append(s.Server.IncomingQueries, bind.Counter(t))
 	}
 	for _, t := range stats.Server.Requests {
-		s.Server.IncomingRequests = append(s.Server.IncomingRequests, counter(t))
+		s.Server.IncomingRequests = append(s.Server.IncomingRequests, bind.Counter(t))
 	}
 	for _, t := range stats.Server.NSStats {
-		s.Server.NameServerStats = append(s.Server.NameServerStats, counter(t))
+		s.Server.NameServerStats = append(s.Server.NameServerStats, bind.Counter(t))
 	}
 	for _, view := range stats.Views {
 		v := bind.View{
 			Name:  view.Name,
 			Cache: view.Cache,
 		}
 		for _, t := range view.Rdtype {
-			v.ResolverQueries = append(v.ResolverQueries, counter(t))
+			v.ResolverQueries = append(v.ResolverQueries, bind.Counter(t))
 		}
 		for _, t := range view.Resstat {
-			v.ResolverStats = append(v.ResolverStats, counter(t))
+			v.ResolverStats = append(v.ResolverStats, bind.Counter(t))
 		}
 		s.Views = append(s.Views, v)
 	}
 	s.TaskManager = stats.Taskmgr
 
 	return s, nil
 }
-
-func counter(c Counter) bind.Counter {
-	return bind.Counter{
-		Name:    c.Name,
-		Counter: c.Counter,
-	}
-}

bind_exporter.go

@@ -24,6 +24,7 @@ import (
 
 const (
 	namespace = "bind"
+	exporter  = "bind_exporter"
 	resolver  = "resolver"
 )
 
@@ -448,14 +449,17 @@ func main() {
 	flag.Parse()
 
 	if *showVersion {
-		fmt.Fprintln(os.Stdout, version.Print("bind_exporter"))
+		fmt.Fprintln(os.Stdout, version.Print(exporter))
 		os.Exit(0)
 	}
-	log.Infoln("Starting bind_exporter", version.Info())
+	log.Infoln("Starting", exporter, version.Info())
 	log.Infoln("Build context", version.BuildContext())
 	log.Infoln("Configured to collect statistics", groups.String())
 
-	prometheus.MustRegister(NewExporter(*bindVersion, *bindURI, *bindTimeout, groups))
+	prometheus.MustRegister(
+		version.NewCollector(exporter),
+		NewExporter(*bindVersion, *bindURI, *bindTimeout, groups),
+	)
 	if *bindPidFile != "" {
 		procExporter := prometheus.NewProcessCollectorPIDFn(
 			func() (int, error) {