integration: serve '/metrics' in separate mux

etcd-io · Jul 11, 2017 · 6f3eea3 · 6f3eea3
1 parent e7ba964
commit 6f3eea3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/integration/cluster.go b/integration/cluster.go
@@ -469,6 +469,7 @@ func NewListenerWithAddr(t *testing.T, addr string) net.Listener {
 type member struct {
 	etcdserver.ServerConfig
 	PeerListeners, ClientListeners []net.Listener
+	metricsMux                     *http.ServeMux
 	grpcListener                   net.Listener
 	// PeerTLSInfo enables peer TLS when set
 	PeerTLSInfo *transport.TLSInfo
@@ -519,6 +520,7 @@ func mustNewMember(t *testing.T, mcfg memberConfig) *member {
 
 	cln := newLocalListener(t)
 	m.ClientListeners = []net.Listener{cln}
+	m.metricsMux = http.NewServeMux()
 	m.ClientURLs, err = types.NewURLs([]string{clientScheme + "://" + cln.Addr().String()})
 	if err != nil {
 		t.Fatal(err)
@@ -668,9 +670,10 @@ func (m *member) Launch() error {
 		m.hss = append(m.hss, hs)
 	}
 	for _, ln := range m.ClientListeners {
+		// TODO: handler metrics handler when v2 is disabled
 		hs := &httptest.Server{
 			Listener: ln,
-			Config:   &http.Server{Handler: v2http.NewClientHandler(m.s, m.ServerConfig.ReqTimeout())},
+			Config:   &http.Server{Handler: v2http.NewClientHandler(m.s, m.metricsMux, m.ServerConfig.ReqTimeout())},
 		}
 		if m.ClientTLSInfo == nil {
 			hs.Start()
@@ -682,6 +685,9 @@ func (m *member) Launch() error {
 			hs.StartTLS()
 		}
 		m.hss = append(m.hss, hs)
+		go func() {
+			http.Serve(ln, m.metricsMux)
+		}()
 	}
 	if m.grpcListener != nil {
 		var (