diff --git a/services/src/main/java/io/grpc/services/MetricRecorder.java b/services/src/main/java/io/grpc/services/MetricRecorder.java index 62b98a71436..5e6376d87fd 100644 --- a/services/src/main/java/io/grpc/services/MetricRecorder.java +++ b/services/src/main/java/io/grpc/services/MetricRecorder.java @@ -102,7 +102,7 @@ public void clearMemoryUtilizationMetric() { /** * Update the QPS metrics data in the range [0, inf). Values outside the valid range are ignored. */ - public void setQps(double value) { + public void setQpsMetric(double value) { if (!MetricRecorderHelper.isQpsValid(value)) { return; } @@ -112,7 +112,7 @@ public void setQps(double value) { /** * Clear the QPS metrics data. */ - public void clearQps() { + public void clearQpsMetric() { qps = 0; } diff --git a/xds/src/test/java/io/grpc/xds/orca/OrcaMetricReportingServerInterceptorTest.java b/xds/src/test/java/io/grpc/xds/orca/OrcaMetricReportingServerInterceptorTest.java index cbe972627ca..7681f0b42f4 100644 --- a/xds/src/test/java/io/grpc/xds/orca/OrcaMetricReportingServerInterceptorTest.java +++ b/xds/src/test/java/io/grpc/xds/orca/OrcaMetricReportingServerInterceptorTest.java @@ -215,7 +215,7 @@ public void responseTrailersContainMergedMetricsFromCallMetricRecorderAndMetricR cpuUtilizationMetrics = 0.3465; memoryUtilizationMetrics = 0.967; metricRecorder.setMemoryUtilizationMetric(0.764); - metricRecorder.setQps(1.618); + metricRecorder.setQpsMetric(1.618); metricRecorder.putUtilizationMetric("serverUtil1", 0.7467); metricRecorder.putUtilizationMetric("serverUtil2", 0.2233); metricRecorder.putUtilizationMetric("util1", 0.01); @@ -240,7 +240,7 @@ public void responseTrailersContainMergedMetricsFromCallMetricRecorderAndMetricR qpsMetrics = 5142.77; metricRecorder.setCpuUtilizationMetric(0.314159); metricRecorder.setMemoryUtilizationMetric(0.764); - metricRecorder.setQps(1.618); + metricRecorder.setQpsMetric(1.618); ClientCalls.blockingUnaryCall(channelToUse, SIMPLE_METHOD, CallOptions.DEFAULT, REQUEST); Metadata receivedTrailers = trailersCapture.get(); diff --git a/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java b/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java index 00025441249..4afa731bdcc 100644 --- a/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java +++ b/xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java @@ -143,7 +143,7 @@ public void testRequestIntervalLess() { ClientCall call = channel.newCall( OpenRcaServiceGrpc.getStreamCoreMetricsMethod(), CallOptions.DEFAULT); defaultTestService.putUtilizationMetric("buffer", 0.2); - defaultTestService.setQps(1.9); + defaultTestService.setQpsMetric(1.9); call.start(listener, new Metadata()); call.sendMessage(OrcaLoadReportRequest.newBuilder() .setReportInterval(Duration.newBuilder().setSeconds(0).setNanos(500).build()).build()); @@ -154,7 +154,7 @@ public void testRequestIntervalLess() { verify(listener).onMessage(eq(expect)); reset(listener); defaultTestService.removeUtilizationMetric("buffer0"); - defaultTestService.clearQps(); + defaultTestService.clearQpsMetric(); assertThat(fakeClock.forwardTime(500, TimeUnit.NANOSECONDS)).isEqualTo(0); verifyNoInteractions(listener); assertThat(fakeClock.forwardTime(1, TimeUnit.SECONDS)).isEqualTo(1); @@ -255,14 +255,14 @@ public void testApis() throws Exception { defaultTestService.setMemoryUtilizationMetric(goldenReport.getMemUtilization()); defaultTestService.setAllUtilizationMetrics(firstUtilization); defaultTestService.putUtilizationMetric("queue", 1.0); - defaultTestService.setQps(1239.01); + defaultTestService.setQpsMetric(1239.01); Iterator reports = OpenRcaServiceGrpc.newBlockingStub(channel) .streamCoreMetrics(OrcaLoadReportRequest.newBuilder().build()); assertThat(reports.next()).isEqualTo(goldenReport); defaultTestService.clearCpuUtilizationMetric(); defaultTestService.clearMemoryUtilizationMetric(); - defaultTestService.clearQps(); + defaultTestService.clearQpsMetric(); fakeClock.forwardTime(1, TimeUnit.SECONDS); goldenReport = OrcaLoadReport.newBuilder() .putAllUtilization(firstUtilization) @@ -279,7 +279,7 @@ public void testApis() throws Exception { defaultTestService.setCpuUtilizationMetric(1.001); defaultTestService.setMemoryUtilizationMetric(-0.001); defaultTestService.setMemoryUtilizationMetric(1.001); - defaultTestService.setQps(-0.001); + defaultTestService.setQpsMetric(-0.001); defaultTestService.putUtilizationMetric("util-out-of-range", -0.001); defaultTestService.putUtilizationMetric("util-out-of-range", 1.001); fakeClock.forwardTime(1, TimeUnit.SECONDS);