Add initial set of metrics for BBR

Author: rramkumar1

Diff for: cmd/body-based-routing/main.go

@@ -18,18 +18,26 @@ package main
 
 import (
 	"flag"
+	"net"
+	"net/http"
 	"os"
+	"strconv"
 
 	"github.com/go-logr/logr"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
 	uberzap "go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc"
 	healthPb "google.golang.org/grpc/health/grpc_health_v1"
+	"k8s.io/client-go/rest"
+	"k8s.io/component-base/metrics/legacyregistry"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
 	"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
 	runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/body-based-routing/server"
+	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
 )
 
@@ -42,6 +50,8 @@ var (
 		"grpcHealthPort",
 		9003,
 		"The port used for gRPC liveness and readiness probes")
+	metricsPort = flag.Int(
+		"metricsPort", 9090, "The metrics port")
 	logVerbosity = flag.Int("v", logging.DEFAULT, "number for the log level verbosity")
 
 	setupLog = ctrl.Log.WithName("setup")
@@ -95,6 +105,11 @@ func run() error {
 		return err
 	}
 
+	// Register metrics handler.
+	if err := registerMetricsHandler(mgr, *metricsPort, cfg); err != nil {
+		return err
+	}
+
 	// Start the manager. This blocks until a signal is received.
 	setupLog.Info("Manager starting")
 	if err := mgr.Start(ctx); err != nil {
@@ -135,3 +150,58 @@ func initLogging(opts *zap.Options) {
 	logger := zap.New(zap.UseFlagOptions(opts), zap.RawZapOpts(uberzap.AddCaller()))
 	ctrl.SetLogger(logger)
 }
+
+const metricsEndpoint = "/metrics"
+
+// registerMetricsHandler adds the metrics HTTP handler as a Runnable to the given manager.
+func registerMetricsHandler(mgr manager.Manager, port int, cfg *rest.Config) error {
+	metrics.Register()
+
+	// Init HTTP server.
+	h, err := metricsHandlerWithAuthenticationAndAuthorization(cfg)
+	if err != nil {
+		return err
+	}
+
+	mux := http.NewServeMux()
+	mux.Handle(metricsEndpoint, h)
+
+	srv := &http.Server{
+		Addr:    net.JoinHostPort("", strconv.Itoa(port)),
+		Handler: mux,
+	}
+
+	if err := mgr.Add(&manager.Server{
+		Name:   "metrics",
+		Server: srv,
+	}); err != nil {
+		setupLog.Error(err, "Failed to register metrics HTTP handler")
+		return err
+	}
+	return nil
+}
+
+func metricsHandlerWithAuthenticationAndAuthorization(cfg *rest.Config) (http.Handler, error) {
+	h := promhttp.HandlerFor(
+		legacyregistry.DefaultGatherer,
+		promhttp.HandlerOpts{},
+	)
+	httpClient, err := rest.HTTPClientFor(cfg)
+	if err != nil {
+		setupLog.Error(err, "Failed to create http client for metrics auth")
+		return nil, err
+	}
+
+	filter, err := filters.WithAuthenticationAndAuthorization(cfg, httpClient)
+	if err != nil {
+		setupLog.Error(err, "Failed to create metrics filter for auth")
+		return nil, err
+	}
+	metricsLogger := ctrl.Log.WithName("metrics").WithValues("path", metricsEndpoint)
+	metricsAuthHandler, err := filter(metricsLogger, h)
+	if err != nil {
+		setupLog.Error(err, "Failed to create metrics auth handler")
+		return nil, err
+	}
+	return metricsAuthHandler, nil
+}

Diff for: pkg/body-based-routing/handlers/request.go

@@ -50,7 +50,7 @@ func (s *Server) HandleRequestBody(ctx context.Context, body *eppb.HttpBody) (*e
 
 	modelStr, ok := modelVal.(string)
 	if !ok {
-		metrics.RecordModelNotParseableCounter()
+		metrics.RecordModelNotParsedCounter()
 		logger.V(logutil.DEFAULT).Info("Model parameter value is not a string")
 		return &eppb.ProcessingResponse{
 			Response: &eppb.ProcessingResponse_RequestBody{

Diff for: pkg/body-based-routing/handlers/request_test.go

@@ -18,12 +18,16 @@ package handlers
 
 import (
 	"context"
+	"strings"
 	"testing"
 
 	basepb "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/protobuf/testing/protocmp"
+	"k8s.io/component-base/metrics/legacyregistry"
+	metricsutils "k8s.io/component-base/metrics/testutil"
+	"sigs.k8s.io/gateway-api-inference-extension/pkg/body-based-routing/metrics"
 	logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
 )
 
@@ -48,6 +52,7 @@ const (
 )
 
 func TestHandleRequestBody(t *testing.T) {
+	metrics.Register()
 	ctx := logutil.NewTestLoggerIntoContext(context.Background())
 
 	tests := []struct {
@@ -125,4 +130,20 @@ func TestHandleRequestBody(t *testing.T) {
 			}
 		})
 	}
+
+	wantMetrics := `
+	# HELP bbr_model_not_in_body_total [ALPHA] Count of times the model was not present in the request body.
+	# TYPE bbr_model_not_in_body_total counter
+	bbr_model_not_in_body_total{} 1
+	# HELP bbr_model_not_parsed_total [ALPHA] Count of times the model was in the request body but we could not parse it.
+	# TYPE bbr_model_not_parsed_total counter
+	bbr_model_not_parsed_total{} 1
+	# HELP bbr_success_total [ALPHA] Count of successes pulling model name from body and injecting it in the request headers.
+	# TYPE bbr_success_total counter
+	bbr_success_total{} 1
+	`
+
+	if err := metricsutils.GatherAndCompare(legacyregistry.DefaultGatherer, strings.NewReader(wantMetrics), "inference_model_request_total"); err != nil {
+		t.Error(err)
+	}
 }

Diff for: pkg/body-based-routing/metrics/metrics.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/component-base/metrics/legacyregistry"
 )
 
-const component = "BodyBasedRouting"
+const component = "bbr"
 
 var (
 	successCounter = compbasemetrics.NewCounterVec(
@@ -44,10 +44,10 @@ var (
 		},
 		[]string{},
 	)
-	modelNotParseableCounter = compbasemetrics.NewCounterVec(
+	modelNotParsedCounter = compbasemetrics.NewCounterVec(
 		&compbasemetrics.CounterOpts{
 			Subsystem:      component,
-			Name:           "model_not_parseable_total",
+			Name:           "model_not_parsed_total",
 			Help:           "Count of times the model was in the request body but we could not parse it.",
 			StabilityLevel: compbasemetrics.ALPHA,
 		},
@@ -75,7 +75,7 @@ func Register() {
 	registerMetrics.Do(func() {
 		legacyregistry.MustRegister(successCounter)
 		legacyregistry.MustRegister(modelNotInBodyCounter)
-		legacyregistry.MustRegister(modelNotParseableCounter)
+		legacyregistry.MustRegister(modelNotParsedCounter)
 		// legacyregistry.MustRegister(modelAlreadyPresentInHeaderCounter)
 	})
 }
@@ -90,9 +90,9 @@ func RecordModelNotInBodyCounter() {
 	modelNotInBodyCounter.WithLabelValues().Inc()
 }
 
-// RecordModelNotParseableCounter records the number of times the model was found in the body but it was not parseable.
-func RecordModelNotParseableCounter() {
-	modelNotParseableCounter.WithLabelValues().Inc()
+// RecordModelNotParsedCounter records the number of times the model was found in the body but it could not be parsed.
+func RecordModelNotParsedCounter() {
+	modelNotParsedCounter.WithLabelValues().Inc()
 }
 
 /*