Skip to content

Commit

Permalink
e2e: test /metrics endpoints with health info
Browse files Browse the repository at this point in the history
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
  • Loading branch information
gyuho committed Jul 24, 2017
1 parent 43e75e7 commit 6a9ae01
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 3 deletions.
10 changes: 10 additions & 0 deletions e2e/cluster_proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ func (p *proxyEtcdProcess) Config() *etcdServerProcessConfig { return p.etcdProc

func (p *proxyEtcdProcess) EndpointsV2() []string { return p.proxyV2.endpoints() }
func (p *proxyEtcdProcess) EndpointsV3() []string { return p.proxyV3.endpoints() }
func (p *proxyEtcdProcess) EndpointsMetrics() []string {
panic("not implemented; proxy doesn't provide health information")
}

func (p *proxyEtcdProcess) Start() error {
if err := p.etcdProc.Start(); err != nil {
Expand Down Expand Up @@ -113,6 +116,7 @@ type proxyProc struct {
execPath string
args []string
ep string
murl string
donec chan struct{}

proc *expect.ExpectProcess
Expand Down Expand Up @@ -232,6 +236,11 @@ func newProxyV3Proc(cfg *etcdServerProcessConfig) *proxyV3Proc {
// pass-through member RPCs
"--advertise-client-url", "",
}
murl := ""
if cfg.murl != "" {
murl = proxyListenURL(cfg, 4)
args = append(args, "--metrics-addr", murl)
}
tlsArgs := []string{}
for i := 0; i < len(cfg.tlsArgs); i++ {
switch cfg.tlsArgs[i] {
Expand All @@ -258,6 +267,7 @@ func newProxyV3Proc(cfg *etcdServerProcessConfig) *proxyV3Proc {
execPath: cfg.execPath,
args: append(args, tlsArgs...),
ep: listenAddr,
murl: murl,
donec: make(chan struct{}),
},
}
Expand Down
13 changes: 12 additions & 1 deletion e2e/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ type etcdProcessClusterConfig struct {
baseScheme string
basePort int

metricsURLScheme string

snapCount int // default is 10000

clientTLS clientConnType
Expand Down Expand Up @@ -175,7 +177,7 @@ func (cfg *etcdProcessClusterConfig) etcdServerProcessConfigs() []*etcdServerPro
for i := 0; i < cfg.clusterSize; i++ {
var curls []string
var curl, curltls string
port := cfg.basePort + 4*i
port := cfg.basePort + 5*i
curlHost := fmt.Sprintf("localhost:%d", port)

switch cfg.clientTLS {
Expand Down Expand Up @@ -221,6 +223,14 @@ func (cfg *etcdProcessClusterConfig) etcdServerProcessConfigs() []*etcdServerPro
if cfg.noStrictReconfig {
args = append(args, "--strict-reconfig-check=false")
}
var murl string
if cfg.metricsURLScheme != "" {
murl = (&url.URL{
Scheme: cfg.metricsURLScheme,
Host: fmt.Sprintf("localhost:%d", port+2),
}).String()
args = append(args, "--listen-metrics-urls", murl)
}

args = append(args, cfg.tlsArgs()...)
etcdCfgs[i] = &etcdServerProcessConfig{
Expand All @@ -232,6 +242,7 @@ func (cfg *etcdProcessClusterConfig) etcdServerProcessConfigs() []*etcdServerPro
name: name,
purl: purl,
acurl: curl,
murl: murl,
initialToken: cfg.initialToken,
}
}
Expand Down
7 changes: 5 additions & 2 deletions e2e/etcd_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var etcdServerReadyLines = []string{"enabled capabilities for version", "publish
type etcdProcess interface {
EndpointsV2() []string
EndpointsV3() []string
EndpointsMetrics() []string

Start() error
Restart() error
Expand Down Expand Up @@ -57,6 +58,7 @@ type etcdServerProcessConfig struct {
purl url.URL

acurl string
murl string

initialToken string
initialCluster string
Expand All @@ -74,8 +76,9 @@ func newEtcdServerProcess(cfg *etcdServerProcessConfig) (*etcdServerProcess, err
return &etcdServerProcess{cfg: cfg, donec: make(chan struct{})}, nil
}

func (ep *etcdServerProcess) EndpointsV2() []string { return []string{ep.cfg.acurl} }
func (ep *etcdServerProcess) EndpointsV3() []string { return ep.EndpointsV2() }
func (ep *etcdServerProcess) EndpointsV2() []string { return []string{ep.cfg.acurl} }
func (ep *etcdServerProcess) EndpointsV3() []string { return ep.EndpointsV2() }
func (ep *etcdServerProcess) EndpointsMetrics() []string { return []string{ep.cfg.murl} }

func (ep *etcdServerProcess) Start() error {
if ep.proc != nil {
Expand Down
46 changes: 46 additions & 0 deletions e2e/metrics_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// Copyright 2017 The etcd Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// +build !cluster_proxy

package e2e

import (
"testing"

"github.com/coreos/etcd/pkg/testutil"
)

func TestV3MetricsSecure(t *testing.T) { testV3Metrics(t, "https") }
func TestV3MetricsInsecure(t *testing.T) { testV3Metrics(t, "http") }
func testV3Metrics(t *testing.T, metricsScheme string) {
defer testutil.AfterTest(t)

cfg := configTLS
cfg.metricsURLScheme = metricsScheme

epc, err := newEtcdProcessCluster(&cfg)
if err != nil {
t.Fatalf("could not start etcd process cluster (%v)", err)
}
defer func() {
if cerr := epc.Close(); err != nil {
t.Fatalf("error closing etcd processes (%v)", cerr)
}
}()

if err = cURLGet(epc, cURLReq{endpoint: "/metrics", expected: `health true`, metricsURL: true}); err != nil {
t.Fatalf("failed get with curl (%v)", err)
}
}
5 changes: 5 additions & 0 deletions e2e/v2_curl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ type cURLReq struct {
value string
expected string
header string

metricsURL bool
}

// cURLPrefixArgs builds the beginning of a curl command for a given key
Expand All @@ -143,6 +145,9 @@ func cURLPrefixArgs(clus *etcdProcessCluster, method string, req cURLReq) []stri
} else if clus.cfg.clientTLS == clientTLS {
cmdArgs = append(cmdArgs, "--cacert", caPath, "--cert", certPath, "--key", privateKeyPath)
}
if req.metricsURL {
acurl = clus.procs[rand.Intn(clus.cfg.clusterSize)].EndpointsMetrics()[0]
}
ep := acurl + req.endpoint

if req.username != "" || req.password != "" {
Expand Down

0 comments on commit 6a9ae01

Please sign in to comment.