Merge pull request #178 from signalfx/disco-thrift

Remove disco/thrift code
signalfx · Mar 6, 2020 · 19d0833 · 19d0833
2 parents 301f2de + 15226f8
commit 19d0833
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 896 deletions.
diff --git a/disco/calc_test.go b/disco/calc_test.go
diff --git a/disco/disco.go b/disco/disco.go
@@ -519,6 +519,11 @@ func (s *Service) byteHashes() string {
 	return r
 }
 
+// StateLog is returned for nesting in wrapping clients.
+func (s *Service) StateLog() log.Logger {
+	return s.stateLog
+}
+
 func childrenServices(logger log.Logger, serviceName string, children []string, zkConn ZkConn) ([]ServiceInstance, error) {
 	logger.Log("getting services")
 	ret := make([]ServiceInstance, len(children))

diff --git a/disco/disco_test.go b/disco/disco_test.go
@@ -348,6 +348,7 @@ func testServices(t *testing.T, z1 zktest.ZkConnSupported, ch <-chan zk.Event, z
 	s, err := d1.Services("not_here")
 	require.NoError(t, err)
 	require.Equal(t, 0, len(s.ServiceInstances()))
+	require.NotNil(t, s.StateLog())
 
 	onWatchChan := make(chan struct{})
 	s.Watch(func() {

diff --git a/disco/gobuild.toml b/disco/gobuild.toml
diff --git a/disco/thrift.go b/disco/thrift.go