weightedroundrobin: cherry-pick 2 commits from master (#6360)

balancer/weightedroundrobin/balancer.go

@@ -419,7 +419,11 @@ func (w *weightedSubConn) OnLoadReport(load *v3orcapb.OrcaLoadReport) {
 		w.logger.Infof("Received load report for subchannel %v: %v", w.SubConn, load)
 	}
 	// Update weights of this subchannel according to the reported load
-	if load.CpuUtilization == 0 || load.RpsFractional == 0 {
+	utilization := load.ApplicationUtilization
+	if utilization == 0 {
+		utilization = load.CpuUtilization
+	}
+	if utilization == 0 || load.RpsFractional == 0 {
 		if w.logger.V(2) {
 			w.logger.Infof("Ignoring empty load report for subchannel %v", w.SubConn)
 		}
@@ -430,7 +434,7 @@ func (w *weightedSubConn) OnLoadReport(load *v3orcapb.OrcaLoadReport) {
 	defer w.mu.Unlock()
 
 	errorRate := load.Eps / load.RpsFractional
-	w.weightVal = load.RpsFractional / (load.CpuUtilization + errorRate*w.cfg.ErrorUtilizationPenalty)
+	w.weightVal = load.RpsFractional / (utilization + errorRate*w.cfg.ErrorUtilizationPenalty)
 	if w.logger.V(2) {
 		w.logger.Infof("New weight for subchannel %v: %v", w.SubConn, w.weightVal)
 	}

balancer/weightedroundrobin/balancer_test.go

@@ -110,7 +110,7 @@ func startServer(t *testing.T, r reportType) *testServer {
 			if r := orca.CallMetricsRecorderFromContext(ctx); r != nil {
 				// Copy metrics from what the test set in cmr into r.
 				sm := cmr.(orca.ServerMetricsProvider).ServerMetrics()
-				r.SetCPUUtilization(sm.CPUUtilization)
+				r.SetApplicationUtilization(sm.AppUtilization)
 				r.SetQPS(sm.QPS)
 				r.SetEPS(sm.EPS)
 			}
@@ -230,10 +230,10 @@ func (s) TestBalancer_TwoAddresses_ReportingEnabledPerCall(t *testing.T) {
 	// srv1 starts loaded and srv2 starts without load; ensure RPCs are routed
 	// disproportionately to srv2 (10:1).
 	srv1.callMetrics.SetQPS(10.0)
-	srv1.callMetrics.SetCPUUtilization(1.0)
+	srv1.callMetrics.SetApplicationUtilization(1.0)
 
 	srv2.callMetrics.SetQPS(10.0)
-	srv2.callMetrics.SetCPUUtilization(.1)
+	srv2.callMetrics.SetApplicationUtilization(.1)
 
 	sc := svcConfig(t, perCallConfig)
 	if err := srv1.StartClient(grpc.WithDefaultServiceConfig(sc)); err != nil {
@@ -253,33 +253,58 @@ func (s) TestBalancer_TwoAddresses_ReportingEnabledPerCall(t *testing.T) {
 // Tests two addresses with OOB ORCA reporting enabled.  Checks the backends
 // are called in the appropriate ratios.
 func (s) TestBalancer_TwoAddresses_ReportingEnabledOOB(t *testing.T) {
-	ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
-	defer cancel()
+	testCases := []struct {
+		name       string
+		utilSetter func(orca.ServerMetricsRecorder, float64)
+	}{{
+		name: "application_utilization",
+		utilSetter: func(smr orca.ServerMetricsRecorder, val float64) {
+			smr.SetApplicationUtilization(val)
+		},
+	}, {
+		name: "cpu_utilization",
+		utilSetter: func(smr orca.ServerMetricsRecorder, val float64) {
+			smr.SetCPUUtilization(val)
+		},
+	}, {
+		name: "application over cpu",
+		utilSetter: func(smr orca.ServerMetricsRecorder, val float64) {
+			smr.SetApplicationUtilization(val)
+			smr.SetCPUUtilization(2.0) // ignored because ApplicationUtilization is set
+		},
+	}}
 
-	srv1 := startServer(t, reportOOB)
-	srv2 := startServer(t, reportOOB)
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
+			defer cancel()
 
-	// srv1 starts loaded and srv2 starts without load; ensure RPCs are routed
-	// disproportionately to srv2 (10:1).
-	srv1.oobMetrics.SetQPS(10.0)
-	srv1.oobMetrics.SetCPUUtilization(1.0)
+			srv1 := startServer(t, reportOOB)
+			srv2 := startServer(t, reportOOB)
 
-	srv2.oobMetrics.SetQPS(10.0)
-	srv2.oobMetrics.SetCPUUtilization(.1)
+			// srv1 starts loaded and srv2 starts without load; ensure RPCs are routed
+			// disproportionately to srv2 (10:1).
+			srv1.oobMetrics.SetQPS(10.0)
+			tc.utilSetter(srv1.oobMetrics, 1.0)
 
-	sc := svcConfig(t, oobConfig)
-	if err := srv1.StartClient(grpc.WithDefaultServiceConfig(sc)); err != nil {
-		t.Fatalf("Error starting client: %v", err)
-	}
-	addrs := []resolver.Address{{Addr: srv1.Address}, {Addr: srv2.Address}}
-	srv1.R.UpdateState(resolver.State{Addresses: addrs})
+			srv2.oobMetrics.SetQPS(10.0)
+			tc.utilSetter(srv2.oobMetrics, 0.1)
 
-	// Call each backend once to ensure the weights have been received.
-	ensureReached(ctx, t, srv1.Client, 2)
+			sc := svcConfig(t, oobConfig)
+			if err := srv1.StartClient(grpc.WithDefaultServiceConfig(sc)); err != nil {
+				t.Fatalf("Error starting client: %v", err)
+			}
+			addrs := []resolver.Address{{Addr: srv1.Address}, {Addr: srv2.Address}}
+			srv1.R.UpdateState(resolver.State{Addresses: addrs})
 
-	// Wait for the weight update period to allow the new weights to be processed.
-	time.Sleep(weightUpdatePeriod)
-	checkWeights(ctx, t, srvWeight{srv1, 1}, srvWeight{srv2, 10})
+			// Call each backend once to ensure the weights have been received.
+			ensureReached(ctx, t, srv1.Client, 2)
+
+			// Wait for the weight update period to allow the new weights to be processed.
+			time.Sleep(weightUpdatePeriod)
+			checkWeights(ctx, t, srvWeight{srv1, 1}, srvWeight{srv2, 10})
+		})
+	}
 }
 
 // Tests two addresses with OOB ORCA reporting enabled, where the reports
@@ -295,10 +320,10 @@ func (s) TestBalancer_TwoAddresses_UpdateLoads(t *testing.T) {
 	// srv1 starts loaded and srv2 starts without load; ensure RPCs are routed
 	// disproportionately to srv2 (10:1).
 	srv1.oobMetrics.SetQPS(10.0)
-	srv1.oobMetrics.SetCPUUtilization(1.0)
+	srv1.oobMetrics.SetApplicationUtilization(1.0)
 
 	srv2.oobMetrics.SetQPS(10.0)
-	srv2.oobMetrics.SetCPUUtilization(.1)
+	srv2.oobMetrics.SetApplicationUtilization(.1)
 
 	sc := svcConfig(t, oobConfig)
 	if err := srv1.StartClient(grpc.WithDefaultServiceConfig(sc)); err != nil {
@@ -317,10 +342,10 @@ func (s) TestBalancer_TwoAddresses_UpdateLoads(t *testing.T) {
 	// Update the loads so srv2 is loaded and srv1 is not; ensure RPCs are
 	// routed disproportionately to srv1.
 	srv1.oobMetrics.SetQPS(10.0)
-	srv1.oobMetrics.SetCPUUtilization(.1)
+	srv1.oobMetrics.SetApplicationUtilization(.1)
 
 	srv2.oobMetrics.SetQPS(10.0)
-	srv2.oobMetrics.SetCPUUtilization(1.0)
+	srv2.oobMetrics.SetApplicationUtilization(1.0)
 
 	// Wait for the weight update period to allow the new weights to be processed.
 	time.Sleep(weightUpdatePeriod + oobReportingInterval)
@@ -340,19 +365,19 @@ func (s) TestBalancer_TwoAddresses_OOBThenPerCall(t *testing.T) {
 	// srv1 starts loaded and srv2 starts without load; ensure RPCs are routed
 	// disproportionately to srv2 (10:1).
 	srv1.oobMetrics.SetQPS(10.0)
-	srv1.oobMetrics.SetCPUUtilization(1.0)
+	srv1.oobMetrics.SetApplicationUtilization(1.0)
 
 	srv2.oobMetrics.SetQPS(10.0)
-	srv2.oobMetrics.SetCPUUtilization(.1)
+	srv2.oobMetrics.SetApplicationUtilization(.1)
 
 	// For per-call metrics (not used initially), srv2 reports that it is
 	// loaded and srv1 reports low load.  After confirming OOB works, switch to
 	// per-call and confirm the new routing weights are applied.
 	srv1.callMetrics.SetQPS(10.0)
-	srv1.callMetrics.SetCPUUtilization(.1)
+	srv1.callMetrics.SetApplicationUtilization(.1)
 
 	srv2.callMetrics.SetQPS(10.0)
-	srv2.callMetrics.SetCPUUtilization(1.0)
+	srv2.callMetrics.SetApplicationUtilization(1.0)
 
 	sc := svcConfig(t, oobConfig)
 	if err := srv1.StartClient(grpc.WithDefaultServiceConfig(sc)); err != nil {
@@ -396,13 +421,13 @@ func (s) TestBalancer_TwoAddresses_ErrorPenalty(t *testing.T) {
 	// to 0.9 which will cause the weights to be equal and RPCs to be routed
 	// 50/50.
 	srv1.oobMetrics.SetQPS(10.0)
-	srv1.oobMetrics.SetCPUUtilization(1.0)
+	srv1.oobMetrics.SetApplicationUtilization(1.0)
 	srv1.oobMetrics.SetEPS(0)
 	// srv1 weight before: 10.0 / 1.0 = 10.0
 	// srv1 weight after:  10.0 / 1.0 = 10.0
 
 	srv2.oobMetrics.SetQPS(10.0)
-	srv2.oobMetrics.SetCPUUtilization(.1)
+	srv2.oobMetrics.SetApplicationUtilization(.1)
 	srv2.oobMetrics.SetEPS(10.0)
 	// srv2 weight before: 10.0 / 0.1 = 100.0
 	// srv2 weight after:  10.0 / 1.0 = 10.0
@@ -476,10 +501,10 @@ func (s) TestBalancer_TwoAddresses_BlackoutPeriod(t *testing.T) {
 		// srv1 starts loaded and srv2 starts without load; ensure RPCs are routed
 		// disproportionately to srv2 (10:1).
 		srv1.oobMetrics.SetQPS(10.0)
-		srv1.oobMetrics.SetCPUUtilization(1.0)
+		srv1.oobMetrics.SetApplicationUtilization(1.0)
 
 		srv2.oobMetrics.SetQPS(10.0)
-		srv2.oobMetrics.SetCPUUtilization(.1)
+		srv2.oobMetrics.SetApplicationUtilization(.1)
 
 		cfg := oobConfig
 		cfg.BlackoutPeriod = tc.blackoutPeriodCfg
@@ -544,10 +569,10 @@ func (s) TestBalancer_TwoAddresses_WeightExpiration(t *testing.T) {
 	// is 1 minute but the weights expire in 1 second, routing will go to 50/50
 	// after the weights expire.
 	srv1.oobMetrics.SetQPS(10.0)
-	srv1.oobMetrics.SetCPUUtilization(1.0)
+	srv1.oobMetrics.SetApplicationUtilization(1.0)
 
 	srv2.oobMetrics.SetQPS(10.0)
-	srv2.oobMetrics.SetCPUUtilization(.1)
+	srv2.oobMetrics.SetApplicationUtilization(.1)
 
 	cfg := oobConfig
 	cfg.OOBReportingPeriod = stringp("60s")
@@ -594,16 +619,16 @@ func (s) TestBalancer_AddressesChanging(t *testing.T) {
 
 	// srv1: weight 10
 	srv1.oobMetrics.SetQPS(10.0)
-	srv1.oobMetrics.SetCPUUtilization(1.0)
+	srv1.oobMetrics.SetApplicationUtilization(1.0)
 	// srv2: weight 100
 	srv2.oobMetrics.SetQPS(10.0)
-	srv2.oobMetrics.SetCPUUtilization(.1)
+	srv2.oobMetrics.SetApplicationUtilization(.1)
 	// srv3: weight 20
 	srv3.oobMetrics.SetQPS(20.0)
-	srv3.oobMetrics.SetCPUUtilization(1.0)
+	srv3.oobMetrics.SetApplicationUtilization(1.0)
 	// srv4: weight 200
 	srv4.oobMetrics.SetQPS(20.0)
-	srv4.oobMetrics.SetCPUUtilization(.1)
+	srv4.oobMetrics.SetApplicationUtilization(.1)
 
 	sc := svcConfig(t, oobConfig)
 	if err := srv1.StartClient(grpc.WithDefaultServiceConfig(sc)); err != nil {

examples/go.mod

@@ -3,7 +3,7 @@ module google.golang.org/grpc/examples
 go 1.17
 
 require (
-	github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195
+	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4
 	github.com/golang/protobuf v1.5.3
 	golang.org/x/oauth2 v0.7.0
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1

examples/go.sum

@@ -627,8 +627,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

gcp/observability/go.sum

@@ -638,7 +638,7 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

go.mod

@@ -5,7 +5,7 @@ go 1.17
 require (
 	github.com/cespare/xxhash/v2 v2.2.0
 	github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe
-	github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195
+	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4
 	github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f
 	github.com/golang/glog v1.1.0
 	github.com/golang/protobuf v1.5.3

go.sum

@@ -13,8 +13,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=
 github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f h1:7T++XKzy4xg7PKy+bM+Sa9/oe1OC88yz2hXQUISoXfA=

interop/observability/go.mod

@@ -18,7 +18,7 @@ require (
 	contrib.go.opencensus.io/exporter/stackdriver v0.13.12 // indirect
 	github.com/aws/aws-sdk-go v1.44.162 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 // indirect
+	github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
 	github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect

interop/observability/go.sum

@@ -638,8 +638,8 @@ github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4=
-github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

orca/call_metrics_test.go

@@ -23,13 +23,11 @@ import (
 	"errors"
 	"io"
 	"testing"
-	"time"
 
 	"github.com/golang/protobuf/proto"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/grpc/internal/grpctest"
 	"google.golang.org/grpc/internal/pretty"
 	"google.golang.org/grpc/internal/stubserver"
 	"google.golang.org/grpc/metadata"
@@ -41,16 +39,6 @@ import (
 	testpb "google.golang.org/grpc/interop/grpc_testing"
 )
 
-type s struct {
-	grpctest.Tester
-}
-
-func Test(t *testing.T) {
-	grpctest.RunSubTests(t, s{})
-}
-
-const defaultTestTimeout = 5 * time.Second
-
 // TestE2ECallMetricsUnary tests the injection of custom backend metrics from
 // the server application for a unary RPC, and verifies that expected load
 // reports are received at the client.
@@ -65,9 +53,9 @@ func (s) TestE2ECallMetricsUnary(t *testing.T) {
 			injectMetrics: true,
 			wantProto: &v3orcapb.OrcaLoadReport{
 				CpuUtilization: 1.0,
-				MemUtilization: 50.0,
+				MemUtilization: 0.9,
 				RequestCost:    map[string]float64{"queryCost": 25.0},
-				Utilization:    map[string]float64{"queueSize": 75.0},
+				Utilization:    map[string]float64{"queueSize": 0.75},
 			},
 		},
 		{
@@ -92,7 +80,7 @@ func (s) TestE2ECallMetricsUnary(t *testing.T) {
 					t.Error(err)
 					return nil, err
 				}
-				recorder.SetMemoryUtilization(50.0)
+				recorder.SetMemoryUtilization(0.9)
 				// This value will be overwritten by a write to the same metric
 				// from the server handler.
 				recorder.SetNamedUtilization("queueSize", 1.0)
@@ -114,7 +102,7 @@ func (s) TestE2ECallMetricsUnary(t *testing.T) {
 						return nil, err
 					}
 					recorder.SetRequestCost("queryCost", 25.0)
-					recorder.SetNamedUtilization("queueSize", 75.0)
+					recorder.SetNamedUtilization("queueSize", 0.75)
 					return &testpb.Empty{}, nil
 				},
 			}
@@ -171,9 +159,9 @@ func (s) TestE2ECallMetricsStreaming(t *testing.T) {
 			injectMetrics: true,
 			wantProto: &v3orcapb.OrcaLoadReport{
 				CpuUtilization: 1.0,
-				MemUtilization: 50.0,
-				RequestCost:    map[string]float64{"queryCost": 25.0},
-				Utilization:    map[string]float64{"queueSize": 75.0},
+				MemUtilization: 0.5,
+				RequestCost:    map[string]float64{"queryCost": 0.25},
+				Utilization:    map[string]float64{"queueSize": 0.75},
 			},
 		},
 		{
@@ -198,7 +186,7 @@ func (s) TestE2ECallMetricsStreaming(t *testing.T) {
 					t.Error(err)
 					return err
 				}
-				recorder.SetMemoryUtilization(50.0)
+				recorder.SetMemoryUtilization(0.5)
 				// This value will be overwritten by a write to the same metric
 				// from the server handler.
 				recorder.SetNamedUtilization("queueSize", 1.0)
@@ -217,8 +205,8 @@ func (s) TestE2ECallMetricsStreaming(t *testing.T) {
 							t.Error(err)
 							return err
 						}
-						recorder.SetRequestCost("queryCost", 25.0)
-						recorder.SetNamedUtilization("queueSize", 75.0)
+						recorder.SetRequestCost("queryCost", 0.25)
+						recorder.SetNamedUtilization("queueSize", 0.75)
 					}
 
 					// Streaming implementation replies with a dummy response until the