From 65b82509f9f7a135eb61e033038bd53c03b92a70 Mon Sep 17 00:00:00 2001
From: Sergii Tkachenko <sergiitk@google.com>
Date: Mon, 11 Mar 2024 14:25:08 -0700
Subject: [PATCH] xds: Stabilize CsdsService

---
 .../main/java/io/grpc/xds/CsdsService.java    | 63 +++++++++++--------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/xds/src/main/java/io/grpc/xds/CsdsService.java b/xds/src/main/java/io/grpc/xds/CsdsService.java
index 69aee71f17f..0102836660c 100644
--- a/xds/src/main/java/io/grpc/xds/CsdsService.java
+++ b/xds/src/main/java/io/grpc/xds/CsdsService.java
@@ -28,7 +28,8 @@
 import io.envoyproxy.envoy.service.status.v3.ClientStatusDiscoveryServiceGrpc;
 import io.envoyproxy.envoy.service.status.v3.ClientStatusRequest;
 import io.envoyproxy.envoy.service.status.v3.ClientStatusResponse;
-import io.grpc.ExperimentalApi;
+import io.grpc.BindableService;
+import io.grpc.ServerServiceDefinition;
 import io.grpc.Status;
 import io.grpc.StatusException;
 import io.grpc.internal.ObjectPool;
@@ -55,11 +56,10 @@
  *
  * @since 1.37.0
  */
-@ExperimentalApi("https://github.com/grpc/grpc-java/issues/8016")
-public final class CsdsService extends
-    ClientStatusDiscoveryServiceGrpc.ClientStatusDiscoveryServiceImplBase {
+public final class CsdsService implements BindableService {
   private static final Logger logger = Logger.getLogger(CsdsService.class.getName());
   private final XdsClientPoolFactory xdsClientPoolFactory;
+  private final CsdsServiceInternal delegate = new CsdsServiceInternal();
 
   @VisibleForTesting
   CsdsService(XdsClientPoolFactory xdsClientPoolFactory) {
@@ -76,34 +76,43 @@ public static CsdsService newInstance() {
   }
 
   @Override
-  public void fetchClientStatus(
-      ClientStatusRequest request, StreamObserver<ClientStatusResponse> responseObserver) {
-    if (handleRequest(request, responseObserver)) {
-      responseObserver.onCompleted();
-    }
-    // TODO(sergiitk): Add a case covering mutating handleRequest return false to true - to verify
-    //   that responseObserver.onCompleted() isn't erroneously called on error.
+  public ServerServiceDefinition bindService() {
+    return delegate.bindService();
   }
 
-  @Override
-  public StreamObserver<ClientStatusRequest> streamClientStatus(
-      final StreamObserver<ClientStatusResponse> responseObserver) {
-    return new StreamObserver<ClientStatusRequest>() {
-      @Override
-      public void onNext(ClientStatusRequest request) {
-        handleRequest(request, responseObserver);
+  /** Hide protobuf from being exposed via the API. */
+  private final class CsdsServiceInternal
+      extends ClientStatusDiscoveryServiceGrpc.ClientStatusDiscoveryServiceImplBase {
+    @Override
+    public void fetchClientStatus(
+        ClientStatusRequest request, StreamObserver<ClientStatusResponse> responseObserver) {
+      if (handleRequest(request, responseObserver)) {
+        responseObserver.onCompleted();
       }
+      // TODO(sergiitk): Add a case covering mutating handleRequest return false to true - to verify
+      //   that responseObserver.onCompleted() isn't erroneously called on error.
+    }
 
-      @Override
-      public void onError(Throwable t) {
-        onCompleted();
-      }
+    @Override
+    public StreamObserver<ClientStatusRequest> streamClientStatus(
+        final StreamObserver<ClientStatusResponse> responseObserver) {
+      return new StreamObserver<ClientStatusRequest>() {
+        @Override
+        public void onNext(ClientStatusRequest request) {
+          handleRequest(request, responseObserver);
+        }
 
-      @Override
-      public void onCompleted() {
-        responseObserver.onCompleted();
-      }
-    };
+        @Override
+        public void onError(Throwable t) {
+          onCompleted();
+        }
+
+        @Override
+        public void onCompleted() {
+          responseObserver.onCompleted();
+        }
+      };
+    }
   }
 
   private boolean handleRequest(