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

core: fix channelz import on AutoConfiguredLoadBalancerFactory 

The original PR was stale when merged.
This commit is contained in:
Spencer Fang 2018-09-19 12:45:13 -07:00 committed by Eric Anderson
parent 0afc10c2d6
commit cc09eab9af
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java
View File

@ -23,6 +23,7 @@ import io.grpc.Attributes;
import io.grpc.ConnectivityState; import io.grpc.ConnectivityState;
import io.grpc.ConnectivityStateInfo; import io.grpc.ConnectivityStateInfo;
import io.grpc.EquivalentAddressGroup; import io.grpc.EquivalentAddressGroup;
import io.grpc.InternalChannelz.ChannelTrace;
import io.grpc.LoadBalancer; import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.Helper;
import io.grpc.LoadBalancer.PickResult; import io.grpc.LoadBalancer.PickResult;
@ -30,7 +31,6 @@ import io.grpc.LoadBalancer.PickSubchannelArgs;
import io.grpc.LoadBalancer.SubchannelPicker; import io.grpc.LoadBalancer.SubchannelPicker;
import io.grpc.PickFirstBalancerFactory; import io.grpc.PickFirstBalancerFactory;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.internal.Channelz.ChannelTrace;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;

4
core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java
View File

@ -26,6 +26,7 @@ import io.grpc.Attributes;
import io.grpc.ConnectivityState; import io.grpc.ConnectivityState;
import io.grpc.ConnectivityStateInfo; import io.grpc.ConnectivityStateInfo;
import io.grpc.EquivalentAddressGroup; import io.grpc.EquivalentAddressGroup;
import io.grpc.InternalChannelz;
import io.grpc.LoadBalancer; import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.Helper;
import io.grpc.LoadBalancer.Subchannel; import io.grpc.LoadBalancer.Subchannel;
@ -271,7 +272,8 @@ public class AutoConfiguredLoadBalancerFactoryTest {
} }
}; };
Channelz.ChannelStats.Builder statsBuilder = new Channelz.ChannelStats.Builder(); InternalChannelz.ChannelStats.Builder statsBuilder
= new InternalChannelz.ChannelStats.Builder();
channelTracer.updateBuilder(statsBuilder); channelTracer.updateBuilder(statsBuilder);
List<EquivalentAddressGroup> servers = List<EquivalentAddressGroup> servers =
Collections.singletonList( Collections.singletonList(