diff --git a/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java b/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java index 633bd6af91..a17d56789a 100644 --- a/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java +++ b/xds/src/main/java/io/grpc/xds/EnvoyProtoData.java @@ -1358,6 +1358,9 @@ final class EnvoyProtoData { io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.Builder builder = io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.newBuilder() .setClusterName(clusterName); + if (clusterServiceName != null) { + builder.setClusterServiceName(clusterServiceName); + } for (UpstreamLocalityStats upstreamLocalityStats : upstreamLocalityStatsList) { builder.addUpstreamLocalityStats( upstreamLocalityStats.toEnvoyProtoUpstreamLocalityStatsV2()); diff --git a/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java b/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java index 600075fc41..1bfeb866fe 100644 --- a/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java +++ b/xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java @@ -557,6 +557,7 @@ public class EnvoyProtoDataTest { ClusterStats clusterStats = ClusterStats.newBuilder() .setClusterName("cluster1") + .setClusterServiceName("backend-service1") .setLoadReportIntervalNanos(1234) .setTotalDroppedRequests(123) .addUpstreamLocalityStats(UpstreamLocalityStats.newBuilder() @@ -579,6 +580,7 @@ public class EnvoyProtoDataTest { assertThat(clusterStatsProto).isEqualTo( io.envoyproxy.envoy.config.endpoint.v3.ClusterStats.newBuilder() .setClusterName("cluster1") + .setClusterServiceName("backend-service1") .setLoadReportInterval(Durations.fromNanos(1234)) .setTotalDroppedRequests(123) .addUpstreamLocalityStats( @@ -605,6 +607,7 @@ public class EnvoyProtoDataTest { assertThat(clusterStatsProtoV2).isEqualTo( io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.newBuilder() .setClusterName("cluster1") + .setClusterServiceName("backend-service1") .setLoadReportInterval(Durations.fromNanos(1234)) .setTotalDroppedRequests(123) .addUpstreamLocalityStats(