Add more debug info

Signed-off-by: Benjamin Wang <[email protected]>

server/etcdserver/api/v3rpc/grpc.go

@@ -16,6 +16,7 @@ package v3rpc
 
 import (
 	"crypto/tls"
+	"fmt"
 	"math"
 
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
@@ -44,6 +45,7 @@ func Server(s *etcdserver.EtcdServer, tls *tls.Config, interceptor grpc.UnarySer
 
 	var mopts []grpc_prometheus.ServerMetricsOption
 	if s.Cfg.Metrics == "extensive" {
+		fmt.Println("###### IN v3rpc.Server, enabling the extensive metrics")
 		mopts = append(mopts, grpc_prometheus.WithServerHandlingTimeHistogram())
 	}
 	serverMetrics := grpc_prometheus.NewServerMetrics(mopts...)

tests/framework/integration/cluster.go

@@ -963,6 +963,7 @@ func (m *Member) Launch() error {
 		zap.Strings("advertise-peer-urls", m.PeerURLs.StringSlice()),
 		zap.Strings("listen-client-urls", m.ClientURLs.StringSlice()),
 		zap.String("grpc-url", m.GRPCURL),
+		zap.String("metrics", m.Metrics),
 	)
 	var err error
 	if m.Server, err = etcdserver.NewServer(m.ServerConfig); err != nil {

tests/integration/clientv3/metrics_test.go

@@ -19,11 +19,13 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"maps"
 	"net"
 	"net/http"
 	"slices"
+	"sort"
 	"strconv"
 	"strings"
 	"testing"
@@ -321,9 +323,11 @@ func TestAllMetricsGenerated(t *testing.T) {
 
 	// Get the list of generated metrics
 	generatedMetrics := getMetricsList(t, url)
+	sort.Strings(generatedMetrics)
+	t.Logf("All generated metrics: %v", formatMetrics(generatedMetrics))
 	for _, metric := range expectedMetrics {
 		if !slices.Contains(generatedMetrics, metric) {
-			t.Errorf("Expected metric %s not found in generated metrics", metric)
+			t.Fatalf("Expected metric %s not found in generated metrics", metric)
 		}
 	}
 }
@@ -337,3 +341,12 @@ func getMetricsList(t *testing.T, url string) []string {
 	}
 	return slices.Collect(maps.Keys(mfs))
 }
+
+func formatMetrics(metrics []string) string {
+	quoted := make([]string, len(metrics))
+	for i, s := range metrics {
+		quoted[i] = fmt.Sprintf(`"%s",`, s)
+	}
+
+	return fmt.Sprintf("[]string{\n%s\n}", strings.Join(quoted, "\n"))
+}