From 3b4892f9267e89160de94529bc27201289f2aa58 Mon Sep 17 00:00:00 2001
From: Michael Baird <mbaird@umbel.com>
Date: Mon, 16 Oct 2017 12:08:48 -0500
Subject: [PATCH] simplifying the diagnostics client.  Using circuit breaker to
 manage the diagnostics http connection.

---
 server.go        |  6 ------
 server/server.go | 20 +++++---------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/server.go b/server.go
index 2276e4e6e..cab93b4b5 100644
--- a/server.go
+++ b/server.go
@@ -565,12 +565,6 @@ func (s *Server) monitorDiagnostics() {
 
 // monitorRuntime periodically polls the Go runtime metrics.
 func (s *Server) monitorRuntime() {
-	s.Holder.Stats.Set("Host", s.Host, 1.0)
-	s.Holder.Stats.Set("Cluster", strings.Join(s.Cluster.NodeSetHosts(), ","), 1.0)
-	s.Holder.Stats.Set("NumNodes", strconv.Itoa(len(s.Cluster.Nodes)), 1.0)
-	s.Holder.Stats.Set("NumCPU", strconv.Itoa(runtime.NumCPU()), 1.0)
-	// TODO should we force this to run for diagnostics?
-
 	// Disable metrics when poll interval is zero.
 	if s.MetricInterval <= 0 {
 		return
diff --git a/server/server.go b/server/server.go
index 0ce1680c2..d1063f306 100644
--- a/server/server.go
+++ b/server/server.go
@@ -31,7 +31,6 @@ import (
 
 	"crypto/tls"
 	"github.com/pilosa/pilosa"
-	"github.com/pilosa/pilosa/diagnostics"
 	"github.com/pilosa/pilosa/gossip"
 	"github.com/pilosa/pilosa/statsd"
 )
@@ -42,8 +41,7 @@ func init() {
 
 const (
 	// DefaultDataDir is the default data directory.
-	DefaultDataDir          = "~/.pilosa"
-	DefaultDiagnosticServer = "https://requestb.in/w3uukzw3"
+	DefaultDataDir = "~/.pilosa"
 )
 
 // Command represents the state of the pilosa server command.
@@ -247,20 +245,12 @@ func (m *Command) Close() error {
 
 // NewStatsClient creates a stats client from the config
 func NewStatsClient(name string, host string) (pilosa.StatsClient, error) {
-	ms := make(pilosa.MultiStatsClient, 1)
-	d := diagnostics.New(DefaultDiagnosticServer)
-	d.SetVersion(pilosa.Version)
-	ms[0] = d
-
 	switch name {
 	case "expvar":
-		ms = append(ms, pilosa.NewExpvarStatsClient())
+		return pilosa.NewExpvarStatsClient(), nil
 	case "statsd":
-		r, err := statsd.NewStatsClient(host)
-		if err != nil {
-			return nil, err
-		}
-		ms = append(ms, r)
+		return statsd.NewStatsClient(host)
+	default:
+		return pilosa.NopStatsClient, nil
 	}
-	return ms, nil
 }