grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: Rename grpc.xds.cluster to grpc.lb.backend_service 

The name is being changed to allow the value to be used in more metrics
where xds-specifics are awkward.
This commit is contained in:
Eric Anderson 2025-01-17 16:06:36 -08:00
parent a0a42fc8e6
commit fc86084df5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xds/src/main/java/io/grpc/xds/ClusterImplLoadBalancer.java
View File

@ -385,7 +385,7 @@ final class ClusterImplLoadBalancer extends LoadBalancer {
public PickResult pickSubchannel(PickSubchannelArgs args) {
args.getCallOptions().getOption(ClusterImplLoadBalancerProvider.FILTER_METADATA_CONSUMER)
.accept(filterMetadata);
args.getPickDetailsConsumer().addOptionalLabel("grpc.xds.cluster", cluster);
args.getPickDetailsConsumer().addOptionalLabel("grpc.lb.backend_service", cluster);
for (DropOverload dropOverload : dropPolicies) {
int rand = random.nextInt(1_000_000);
if (rand < dropOverload.dropsPerMillion()) {

4
xds/src/test/java/io/grpc/xds/ClusterImplLoadBalancerTest.java
View File

@ -298,7 +298,7 @@ public class ClusterImplLoadBalancerTest {
// The value will be determined by the parent policy, so can be different than the value used in
// makeAddress() for the test.
verify(detailsConsumer).addOptionalLabel("grpc.lb.locality", locality.toString());
verify(detailsConsumer).addOptionalLabel("grpc.xds.cluster", CLUSTER);
verify(detailsConsumer).addOptionalLabel("grpc.lb.backend_service", CLUSTER);
}
@Test
@ -322,7 +322,7 @@ public class ClusterImplLoadBalancerTest {
TestMethodDescriptors.voidMethod(), new Metadata(), CallOptions.DEFAULT, detailsConsumer);
PickResult result = currentPicker.pickSubchannel(pickSubchannelArgs);
assertThat(result.getStatus().isOk()).isTrue();
verify(detailsConsumer).addOptionalLabel("grpc.xds.cluster", CLUSTER);
verify(detailsConsumer).addOptionalLabel("grpc.lb.backend_service", CLUSTER);
}
@Test