fix warnings

sergiitk · sergiitk · commit 582c6baace0a · 2026-01-23T17:58:50.000-08:00
diff --git a/xds/src/main/java/io/grpc/xds/XdsClusterResource.java b/xds/src/main/java/io/grpc/xds/XdsClusterResource.java
@@ -40,6 +40,7 @@
 import io.envoyproxy.envoy.extensions.transport_sockets.http_11_proxy.v3.Http11ProxyUpstreamTransport;
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.CertificateValidationContext;
 import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.CommonTlsContext;
+import io.grpc.InternalLogId;
 import io.grpc.LoadBalancerRegistry;
 import io.grpc.NameResolver;
 import io.grpc.internal.GrpcUtil;
@@ -50,6 +51,8 @@
 import io.grpc.xds.XdsClusterResource.CdsUpdate;
 import io.grpc.xds.client.BackendMetricPropagation;
 import io.grpc.xds.client.XdsClient.ResourceUpdate;
+import io.grpc.xds.client.XdsLogger;
+import io.grpc.xds.client.XdsLogger.XdsLogLevel;
 import io.grpc.xds.client.XdsResourceType;
 import io.grpc.xds.internal.security.CommonTlsContextUtil;
 import java.util.List;
@@ -87,6 +90,8 @@ class XdsClusterResource extends XdsResourceType<CdsUpdate> {
       "type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer";
   private final LoadBalancerRegistry loadBalancerRegistry
       = LoadBalancerRegistry.getDefaultRegistry();
+  private static final XdsLogger logger = XdsLogger.withLogId(
+        InternalLogId.allocate("xds-cluster-resource", "sergiitk"));
 
   private static final XdsClusterResource instance = new XdsClusterResource();
 
@@ -266,17 +271,23 @@ private static StructOrError<CdsUpdate.Builder> parseNonAggregateCluster(
     String transportSocketName = hasTransportSocket ? transportSocket.getName() : "<invalid>";
     boolean socketIsTls = transportSocketName.equals(TRANSPORT_SOCKET_NAME_TLS);
     boolean socketIsH1Proxy = transportSocketName.equals(TRANSPORT_SOCKET_NAME_HTTP11_PROXY);
-    boolean supportSocketIsH1Proxy = isEnabledXdsHttpConnect && socketIsH1Proxy;
+    boolean socketIsH1ProxyAndSupported = isEnabledXdsHttpConnect && socketIsH1Proxy;
 
-    if (hasTransportSocket && !socketIsTls && !supportSocketIsH1Proxy) {
-      return StructOrError.fromError(
-          "transport-socket with name " + transportSocketName + " not supported, socketIsTls="
-              + socketIsTls + ", socketIsH1Proxy=" + socketIsH1Proxy
-              + ", isEnabledXdsHttpConnect=" + isEnabledXdsHttpConnect
-              + ", supportSocketIsH1Proxy=" + supportSocketIsH1Proxy + ".");
+    if (hasTransportSocket && !(socketIsTls || socketIsH1ProxyAndSupported)) {
+      String errMsg = "transport-socket with name " + transportSocketName + " not supported";
+
+      @SuppressWarnings("AlreadyChecked") // todo remove
+      String extraErrorMsg = errMsg
+          + ", socketIsTls=" + socketIsTls
+          + ", socketIsH1Proxy=" + socketIsH1Proxy
+          + ", isEnabledXdsHttpConnect=" + isEnabledXdsHttpConnect
+          + ", socketIsH1ProxyAndSupported=" + socketIsH1ProxyAndSupported + ".";
+      logger.log(XdsLogLevel.ERROR, extraErrorMsg);
+
+      return StructOrError.fromError(errMsg + ".");
     }
 
-    if (hasTransportSocket && supportSocketIsH1Proxy) {
+    if (hasTransportSocket && socketIsH1ProxyAndSupported) {
       isHttp11ProxyAvailable = true;
       try {
         Http11ProxyUpstreamTransport wrappedTransportSocket = transportSocket
