diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java b/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java index f1b1c79d5dd..18431d6336f 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProvider.java @@ -61,9 +61,10 @@ public ConfigOrError parseLoadBalancingPolicyConfig(Map rawLoadBalanc @Override public LoadBalancer newLoadBalancer(Helper helper) { - return new RpcBehaviorLoadBalancer(helper, + RpcBehaviorHelper rpcBehaviorHelper = new RpcBehaviorHelper(helper); + return new RpcBehaviorLoadBalancer(rpcBehaviorHelper, LoadBalancerRegistry.getDefaultRegistry().getProvider("round_robin") - .newLoadBalancer(helper)); + .newLoadBalancer(rpcBehaviorHelper)); } @Override @@ -99,8 +100,8 @@ static class RpcBehaviorLoadBalancer extends ForwardingLoadBalancer { private final RpcBehaviorHelper helper; private final LoadBalancer delegateLb; - RpcBehaviorLoadBalancer(Helper helper, LoadBalancer delegateLb) { - this.helper = new RpcBehaviorHelper(helper); + RpcBehaviorLoadBalancer(RpcBehaviorHelper helper, LoadBalancer delegateLb) { + this.helper = helper; this.delegateLb = delegateLb; } diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java index a0534aaf4fe..e19208b8883 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/RpcBehaviorLoadBalancerProviderTest.java @@ -80,7 +80,8 @@ public void parseInvalidConfig() { @Test public void handleResolvedAddressesDelegated() { - RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(mockHelper, mockDelegateLb); + RpcBehaviorLoadBalancer lb = new RpcBehaviorLoadBalancer(new RpcBehaviorHelper(mockHelper), + mockDelegateLb); ResolvedAddresses resolvedAddresses = buildResolvedAddresses(buildConfig()); lb.handleResolvedAddresses(resolvedAddresses); verify(mockDelegateLb).handleResolvedAddresses(resolvedAddresses);