From eeb59dd2d78081a237c072504f1d6bd95f18cf20 Mon Sep 17 00:00:00 2001 From: vinodhabib Date: Wed, 23 Apr 2025 10:26:47 +0000 Subject: [PATCH 1/3] xds: Fixed to pretty-print XdsClusterResource with WrrLocality --- xds/src/main/java/io/grpc/xds/MessagePrinter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xds/src/main/java/io/grpc/xds/MessagePrinter.java b/xds/src/main/java/io/grpc/xds/MessagePrinter.java index 5927bfd517e..7512e00ddbf 100644 --- a/xds/src/main/java/io/grpc/xds/MessagePrinter.java +++ b/xds/src/main/java/io/grpc/xds/MessagePrinter.java @@ -32,6 +32,7 @@ import io.envoyproxy.envoy.extensions.filters.http.rbac.v3.RBACPerRoute; import io.envoyproxy.envoy.extensions.filters.http.router.v3.Router; import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager; +import io.envoyproxy.envoy.extensions.load_balancing_policies.wrr_locality.v3.WrrLocality; import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext; import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext; import io.grpc.xds.client.MessagePrettyPrinter; @@ -65,7 +66,8 @@ private static JsonFormat.Printer newPrinter() { .add(RouteConfiguration.getDescriptor()) .add(Cluster.getDescriptor()) .add(ClusterConfig.getDescriptor()) - .add(ClusterLoadAssignment.getDescriptor()); + .add(ClusterLoadAssignment.getDescriptor()) + .add(WrrLocality.getDescriptor()); try { @SuppressWarnings("unchecked") Class routeLookupClusterSpecifierClass = From 70f870477a023450bd508a76708a8902127c3e8b Mon Sep 17 00:00:00 2001 From: vinodhabib Date: Tue, 6 May 2025 06:01:58 +0000 Subject: [PATCH 2/3] xds: Fixed to pretty-print XdsClusterResource with TypedStruct --- xds/src/main/java/io/grpc/xds/MessagePrinter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xds/src/main/java/io/grpc/xds/MessagePrinter.java b/xds/src/main/java/io/grpc/xds/MessagePrinter.java index 7512e00ddbf..8058fe2c8c9 100644 --- a/xds/src/main/java/io/grpc/xds/MessagePrinter.java +++ b/xds/src/main/java/io/grpc/xds/MessagePrinter.java @@ -16,6 +16,7 @@ package io.grpc.xds; +import com.github.xds.type.v3.TypedStruct; import com.google.protobuf.Descriptors.Descriptor; import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Message; @@ -67,7 +68,8 @@ private static JsonFormat.Printer newPrinter() { .add(Cluster.getDescriptor()) .add(ClusterConfig.getDescriptor()) .add(ClusterLoadAssignment.getDescriptor()) - .add(WrrLocality.getDescriptor()); + .add(WrrLocality.getDescriptor()) + .add(TypedStruct.getDescriptor()); try { @SuppressWarnings("unchecked") Class routeLookupClusterSpecifierClass = From 0d9ab67efe8274bbf309e7c0cddfca94072fa1bc Mon Sep 17 00:00:00 2001 From: vinodhabib Date: Wed, 7 May 2025 07:11:02 +0000 Subject: [PATCH 3/3] xds: Fixed to pretty-print XdsClusterResource with RoundRobin --- xds/src/main/java/io/grpc/xds/MessagePrinter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xds/src/main/java/io/grpc/xds/MessagePrinter.java b/xds/src/main/java/io/grpc/xds/MessagePrinter.java index 8058fe2c8c9..db15e961204 100644 --- a/xds/src/main/java/io/grpc/xds/MessagePrinter.java +++ b/xds/src/main/java/io/grpc/xds/MessagePrinter.java @@ -33,6 +33,7 @@ import io.envoyproxy.envoy.extensions.filters.http.rbac.v3.RBACPerRoute; import io.envoyproxy.envoy.extensions.filters.http.router.v3.Router; import io.envoyproxy.envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager; +import io.envoyproxy.envoy.extensions.load_balancing_policies.round_robin.v3.RoundRobin; import io.envoyproxy.envoy.extensions.load_balancing_policies.wrr_locality.v3.WrrLocality; import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext; import io.envoyproxy.envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext; @@ -69,7 +70,8 @@ private static JsonFormat.Printer newPrinter() { .add(ClusterConfig.getDescriptor()) .add(ClusterLoadAssignment.getDescriptor()) .add(WrrLocality.getDescriptor()) - .add(TypedStruct.getDescriptor()); + .add(TypedStruct.getDescriptor()) + .add(RoundRobin.getDescriptor()); try { @SuppressWarnings("unchecked") Class routeLookupClusterSpecifierClass =