diff options
| author | Spencer Fang <spencerfang@google.com> | 2018-09-19 12:45:13 -0700 |
|---|---|---|
| committer | Eric Anderson <ejona@google.com> | 2018-09-19 14:32:16 -0700 |
| commit | cc09eab9afdb676783e4771c1a82d0888edd674d (patch) | |
| tree | 1e9b71d8884f50dc290969382772d9e8930c0f4b /core | |
| parent | 0afc10c2d6d2dedbf0ba3c7f3ec0d21710efe147 (diff) | |
| download | platform_external_grpc-grpc-java-cc09eab9afdb676783e4771c1a82d0888edd674d.tar.gz platform_external_grpc-grpc-java-cc09eab9afdb676783e4771c1a82d0888edd674d.tar.bz2 platform_external_grpc-grpc-java-cc09eab9afdb676783e4771c1a82d0888edd674d.zip | |
core: fix channelz import on AutoConfiguredLoadBalancerFactory
The original PR was stale when merged.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java | 2 | ||||
| -rw-r--r-- | core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java index ce063bd79..a8f778a46 100644 --- a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java +++ b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java @@ -23,6 +23,7 @@ import io.grpc.Attributes; import io.grpc.ConnectivityState; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; +import io.grpc.InternalChannelz.ChannelTrace; import io.grpc.LoadBalancer; import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.PickResult; @@ -30,7 +31,6 @@ import io.grpc.LoadBalancer.PickSubchannelArgs; import io.grpc.LoadBalancer.SubchannelPicker; import io.grpc.PickFirstBalancerFactory; import io.grpc.Status; -import io.grpc.internal.Channelz.ChannelTrace; import java.lang.reflect.Method; import java.util.List; import java.util.Locale; diff --git a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java index 9853b4b05..71c574298 100644 --- a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java +++ b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java @@ -26,6 +26,7 @@ import io.grpc.Attributes; import io.grpc.ConnectivityState; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; +import io.grpc.InternalChannelz; import io.grpc.LoadBalancer; import io.grpc.LoadBalancer.Helper; 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); List<EquivalentAddressGroup> servers = Collections.singletonList( |