Skip to content

Commit e12baed

Browse files
authored
services: rename to (clear)setQpsMetric (#10031)
1 parent 5082b4c commit e12baed

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

services/src/main/java/io/grpc/services/MetricRecorder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void clearMemoryUtilizationMetric() {
102102
/**
103103
* Update the QPS metrics data in the range [0, inf). Values outside the valid range are ignored.
104104
*/
105-
public void setQps(double value) {
105+
public void setQpsMetric(double value) {
106106
if (!MetricRecorderHelper.isQpsValid(value)) {
107107
return;
108108
}
@@ -112,7 +112,7 @@ public void setQps(double value) {
112112
/**
113113
* Clear the QPS metrics data.
114114
*/
115-
public void clearQps() {
115+
public void clearQpsMetric() {
116116
qps = 0;
117117
}
118118

xds/src/test/java/io/grpc/xds/orca/OrcaMetricReportingServerInterceptorTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ public void responseTrailersContainMergedMetricsFromCallMetricRecorderAndMetricR
215215
cpuUtilizationMetrics = 0.3465;
216216
memoryUtilizationMetrics = 0.967;
217217
metricRecorder.setMemoryUtilizationMetric(0.764);
218-
metricRecorder.setQps(1.618);
218+
metricRecorder.setQpsMetric(1.618);
219219
metricRecorder.putUtilizationMetric("serverUtil1", 0.7467);
220220
metricRecorder.putUtilizationMetric("serverUtil2", 0.2233);
221221
metricRecorder.putUtilizationMetric("util1", 0.01);
@@ -240,7 +240,7 @@ public void responseTrailersContainMergedMetricsFromCallMetricRecorderAndMetricR
240240
qpsMetrics = 5142.77;
241241
metricRecorder.setCpuUtilizationMetric(0.314159);
242242
metricRecorder.setMemoryUtilizationMetric(0.764);
243-
metricRecorder.setQps(1.618);
243+
metricRecorder.setQpsMetric(1.618);
244244

245245
ClientCalls.blockingUnaryCall(channelToUse, SIMPLE_METHOD, CallOptions.DEFAULT, REQUEST);
246246
Metadata receivedTrailers = trailersCapture.get();

xds/src/test/java/io/grpc/xds/orca/OrcaServiceImplTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void testRequestIntervalLess() {
143143
ClientCall<OrcaLoadReportRequest, OrcaLoadReport> call = channel.newCall(
144144
OpenRcaServiceGrpc.getStreamCoreMetricsMethod(), CallOptions.DEFAULT);
145145
defaultTestService.putUtilizationMetric("buffer", 0.2);
146-
defaultTestService.setQps(1.9);
146+
defaultTestService.setQpsMetric(1.9);
147147
call.start(listener, new Metadata());
148148
call.sendMessage(OrcaLoadReportRequest.newBuilder()
149149
.setReportInterval(Duration.newBuilder().setSeconds(0).setNanos(500).build()).build());
@@ -154,7 +154,7 @@ public void testRequestIntervalLess() {
154154
verify(listener).onMessage(eq(expect));
155155
reset(listener);
156156
defaultTestService.removeUtilizationMetric("buffer0");
157-
defaultTestService.clearQps();
157+
defaultTestService.clearQpsMetric();
158158
assertThat(fakeClock.forwardTime(500, TimeUnit.NANOSECONDS)).isEqualTo(0);
159159
verifyNoInteractions(listener);
160160
assertThat(fakeClock.forwardTime(1, TimeUnit.SECONDS)).isEqualTo(1);
@@ -255,14 +255,14 @@ public void testApis() throws Exception {
255255
defaultTestService.setMemoryUtilizationMetric(goldenReport.getMemUtilization());
256256
defaultTestService.setAllUtilizationMetrics(firstUtilization);
257257
defaultTestService.putUtilizationMetric("queue", 1.0);
258-
defaultTestService.setQps(1239.01);
258+
defaultTestService.setQpsMetric(1239.01);
259259
Iterator<OrcaLoadReport> reports = OpenRcaServiceGrpc.newBlockingStub(channel)
260260
.streamCoreMetrics(OrcaLoadReportRequest.newBuilder().build());
261261
assertThat(reports.next()).isEqualTo(goldenReport);
262262

263263
defaultTestService.clearCpuUtilizationMetric();
264264
defaultTestService.clearMemoryUtilizationMetric();
265-
defaultTestService.clearQps();
265+
defaultTestService.clearQpsMetric();
266266
fakeClock.forwardTime(1, TimeUnit.SECONDS);
267267
goldenReport = OrcaLoadReport.newBuilder()
268268
.putAllUtilization(firstUtilization)
@@ -279,7 +279,7 @@ public void testApis() throws Exception {
279279
defaultTestService.setCpuUtilizationMetric(1.001);
280280
defaultTestService.setMemoryUtilizationMetric(-0.001);
281281
defaultTestService.setMemoryUtilizationMetric(1.001);
282-
defaultTestService.setQps(-0.001);
282+
defaultTestService.setQpsMetric(-0.001);
283283
defaultTestService.putUtilizationMetric("util-out-of-range", -0.001);
284284
defaultTestService.putUtilizationMetric("util-out-of-range", 1.001);
285285
fakeClock.forwardTime(1, TimeUnit.SECONDS);

0 commit comments

Comments
 (0)