Fixup 12645: Remove unsupported metrics and fix the name for mem_utilization

Author: sauravzg

xds/src/main/java/io/grpc/xds/internal/MetricReportUtils.java

@@ -33,11 +33,8 @@ private MetricReportUtils() {}
    * <ul>
    * <li>"cpu_utilization" -> getCpuUtilization()</li>
    * <li>"application_utilization" -> getApplicationUtilization()</li>
-   * <li>"memory_utilization" -> getMemoryUtilization()</li>
-   * <li>"qps" -> getQps()</li>
-   * <li>"eps" -> getEps()</li>
+   * <li>"mem_utilization" -> getMemoryUtilization()</li>
    * <li>"utilization." -> lookup in utilizationMetrics</li>
-   * <li>"request_cost." -> lookup in requestCostMetrics</li>
    * <li>"named_metrics." -> lookup in namedMetrics</li>
    * </ul>
    *
@@ -50,24 +47,14 @@ public static OptionalDouble getMetric(MetricReport report, String metricName) {
       return OptionalDouble.of(report.getCpuUtilization());
     } else if (metricName.equals("application_utilization")) {
       return OptionalDouble.of(report.getApplicationUtilization());
-    } else if (metricName.equals("memory_utilization")) {
+    } else if (metricName.equals("mem_utilization")) {
       return OptionalDouble.of(report.getMemoryUtilization());
-    } else if (metricName.equals("qps")) {
-      return OptionalDouble.of(report.getQps());
-    } else if (metricName.equals("eps")) {
-      return OptionalDouble.of(report.getEps());
     } else if (metricName.startsWith("utilization.")) {
       Map<String, Double> map = report.getUtilizationMetrics();
       Double val = map.get(metricName.substring("utilization.".length()));
       if (val != null) {
         return OptionalDouble.of(val);
       }
-    } else if (metricName.startsWith("request_cost.")) {
-      Map<String, Double> map = report.getRequestCostMetrics();
-      Double val = map.get(metricName.substring("request_cost.".length()));
-      if (val != null) {
-        return OptionalDouble.of(val);
-      }
     } else if (metricName.startsWith("named_metrics.")) {
       Map<String, Double> map = report.getNamedMetrics();
       Double val = map.get(metricName.substring("named_metrics.".length()));

xds/src/test/java/io/grpc/xds/internal/MetricReportUtilsTest.java

@@ -51,28 +51,13 @@ public void getMetric_applicationUtilization() {
   }
 
   @Test
-  public void getMetric_memoryUtilization() {
+  public void getMetric_memUtilization() {
     MetricReport report = createMetricReport(0.5, 0.1, 0.2, 10.0, 5.0, Collections.emptyMap());
-    OptionalDouble result = MetricReportUtils.getMetric(report, "memory_utilization");
+    OptionalDouble result = MetricReportUtils.getMetric(report, "mem_utilization");
     assertTrue(result.isPresent());
     assertEquals(0.2, result.getAsDouble(), 0.0001);
   }
 
-  @Test
-  public void getMetric_qps() {
-    MetricReport report = createMetricReport(0.5, 0.1, 0.2, 10.0, 5.0, Collections.emptyMap());
-    OptionalDouble result = MetricReportUtils.getMetric(report, "qps");
-    assertTrue(result.isPresent());
-    assertEquals(10.0, result.getAsDouble(), 0.0001);
-  }
-
-  @Test
-  public void getMetric_eps() {
-    MetricReport report = createMetricReport(0.5, 0.1, 0.2, 10.0, 5.0, Collections.emptyMap());
-    OptionalDouble result = MetricReportUtils.getMetric(report, "eps");
-    assertTrue(result.isPresent());
-    assertEquals(5.0, result.getAsDouble(), 0.0001);
-  }
 
   @Test
   public void getMetric_utilizationMetric() {
@@ -88,19 +73,6 @@ public void getMetric_utilizationMetric() {
     assertFalse(MetricReportUtils.getMetric(report, "utilization.bar").isPresent());
   }
 
-  @Test
-  public void getMetric_requestCostMetric() {
-    Map<String, Double> requestCostMetrics = new HashMap<>();
-    requestCostMetrics.put("foo", 4.56);
-    MetricReport report = InternalCallMetricRecorder.createMetricReport(
-        0, 0, 0, 0, 0, requestCostMetrics, Collections.emptyMap(), Collections.emptyMap());
-
-    OptionalDouble result = MetricReportUtils.getMetric(report, "request_cost.foo");
-    assertTrue(result.isPresent());
-    assertEquals(4.56, result.getAsDouble(), 0.0001);
-
-    assertFalse(MetricReportUtils.getMetric(report, "request_cost.bar").isPresent());
-  }
 
   @Test
   public void getMetric_namedMetric() {