From c5566d28430ff86bed5ab2df8fd4dce9cdc51c60 Mon Sep 17 00:00:00 2001
From: Vindhya Ningegowda <DNVindhya@users.noreply.github.com>
Date: Fri, 20 Dec 2024 19:50:09 -0800
Subject: [PATCH] xds: Remove xds authority label from metric registration
 (#11760)

* Remove `grpc.xds.authority` label while registering `grpc.xds_client.resources` gauge, until the label value is available to record.
---
 .../io/grpc/xds/XdsClientMetricReporterImpl.java  |  2 +-
 .../grpc/xds/XdsClientMetricReporterImplTest.java | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/xds/src/main/java/io/grpc/xds/XdsClientMetricReporterImpl.java b/xds/src/main/java/io/grpc/xds/XdsClientMetricReporterImpl.java
index fa88237a7ea..0b592eb019e 100644
--- a/xds/src/main/java/io/grpc/xds/XdsClientMetricReporterImpl.java
+++ b/xds/src/main/java/io/grpc/xds/XdsClientMetricReporterImpl.java
@@ -90,7 +90,7 @@ final class XdsClientMetricReporterImpl implements XdsClientMetricReporter {
         Arrays.asList("grpc.target", "grpc.xds.server"), Collections.emptyList(), false);
     RESOURCES_GAUGE = metricInstrumentRegistry.registerLongGauge("grpc.xds_client.resources",
         "EXPERIMENTAL.  Number of xDS resources.", "{resource}",
-        Arrays.asList("grpc.target", "grpc.xds.authority", "grpc.xds.cache_state",
+        Arrays.asList("grpc.target", "grpc.xds.cache_state",
             "grpc.xds.resource_type"), Collections.emptyList(), false);
   }
 
diff --git a/xds/src/test/java/io/grpc/xds/XdsClientMetricReporterImplTest.java b/xds/src/test/java/io/grpc/xds/XdsClientMetricReporterImplTest.java
index 9ee3f88d921..df5ab87a1c0 100644
--- a/xds/src/test/java/io/grpc/xds/XdsClientMetricReporterImplTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsClientMetricReporterImplTest.java
@@ -17,6 +17,7 @@
 package io.grpc.xds;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.AdditionalAnswers.delegatesTo;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
@@ -82,14 +83,14 @@ public class XdsClientMetricReporterImplTest {
   @Rule
   public final MockitoRule mocks = MockitoJUnit.rule();
 
-  @Mock
-  private MetricRecorder mockMetricRecorder;
   @Mock
   private XdsClient mockXdsClient;
-  @Mock
-  private BatchRecorder mockBatchRecorder;
   @Captor
   private ArgumentCaptor<BatchCallback> gaugeBatchCallbackCaptor;
+  private MetricRecorder mockMetricRecorder = mock(MetricRecorder.class,
+      delegatesTo(new MetricRecorderImpl()));
+  private BatchRecorder mockBatchRecorder = mock(BatchRecorder.class,
+      delegatesTo(new BatchRecorderImpl()));
 
   private XdsClientMetricReporterImpl reporter;
 
@@ -372,6 +373,12 @@ public boolean matches(T instrument) {
     });
   }
 
+  static class MetricRecorderImpl implements MetricRecorder {
+  }
+
+  static class BatchRecorderImpl implements BatchRecorder {
+  }
+
   static class TestlogHandler extends Handler {
     List<LogRecord> logs = new ArrayList<>();