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

all: move Channelz to io.grpc as InternalChannelz (#4797) 

This is an API used to coordinate across packages and must live in
`io.grpc`.

Prepending `Internal` makes it easier to detect and hide this class
from public visibility when using certain build tools.

fixes #4796
This commit is contained in:
zpencer 2018-09-04 16:52:01 -07:00 committed by GitHub
parent f8274c4e7c
commit 4d366ce978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
61 changed files with 265 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
alts/src/main/java/io/grpc/alts/internal/AltsProtocolNegotiator.java
View File

@ -22,12 +22,12 @@ import com.google.protobuf.Any;
import io.grpc.Attributes;
import io.grpc.CallCredentials;
import io.grpc.Grpc;
import io.grpc.InternalChannelz.OtherSecurity;
import io.grpc.InternalChannelz.Security;
import io.grpc.SecurityLevel;
import io.grpc.Status;
import io.grpc.alts.internal.RpcProtocolVersionsUtil.RpcVersionsCheckResult;
import io.grpc.alts.internal.TsiHandshakeHandler.TsiHandshakeCompletionEvent;
import io.grpc.internal.Channelz.OtherSecurity;
import io.grpc.internal.Channelz.Security;
import io.grpc.netty.GrpcHttp2ConnectionHandler;
import io.grpc.netty.ProtocolNegotiator;
import io.grpc.netty.ProtocolNegotiators.AbstractBufferingHandler;

4
alts/src/test/java/io/grpc/alts/internal/AltsProtocolNegotiatorTest.java
View File

@ -26,11 +26,11 @@ import static org.junit.Assert.assertTrue;
import io.grpc.Attributes;
import io.grpc.CallCredentials;
import io.grpc.Grpc;
import io.grpc.InternalChannelz;
import io.grpc.SecurityLevel;
import io.grpc.alts.internal.Handshaker.HandshakerResult;
import io.grpc.alts.internal.TsiFrameProtector.Consumer;
import io.grpc.alts.internal.TsiPeer.Property;
import io.grpc.internal.Channelz;
import io.grpc.netty.GrpcHttp2ConnectionHandler;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator;
@ -405,7 +405,7 @@ public class AltsProtocolNegotiatorTest {
@Override
public void handleProtocolNegotiationCompleted(
Attributes attrs, Channelz.Security securityInfo) {
Attributes attrs, InternalChannelz.Security securityInfo) {
// If we are added to the pipeline, we need to remove ourselves. The HTTP2 handler
channel.pipeline().remove(this);
this.attrs = attrs;

9
core/src/jmh/java/io/grpc/internal/ChannelzBenchmark.java
View File

@ -17,8 +17,11 @@
package io.grpc.internal;
import com.google.common.util.concurrent.ListenableFuture;
import io.grpc.internal.Channelz.ServerStats;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import java.util.concurrent.TimeUnit;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
@ -38,7 +41,7 @@ public class ChannelzBenchmark {
@Param({"10", "100", "1000", "10000"})
public int preexisting;
public Channelz channelz = new Channelz();
public InternalChannelz channelz = new InternalChannelz();
public Instrumented<ServerStats> serverToRemove;

7
core/src/main/java/io/grpc/internal/Instrumented.java → core/src/main/java/io/grpc/Instrumented.java
View File

@ -14,14 +14,17 @@
* limitations under the License.
*/
package io.grpc.internal;
package io.grpc;
import com.google.common.util.concurrent.ListenableFuture;
/**
* An interface for types that <b>may</b> support instrumentation. If the actual type does not
* An internal class. Do not use.
*
* <p>An interface for types that <b>may</b> support instrumentation. If the actual type does not
* support instrumentation, then the future will return a {@code null}.
*/
@Internal
public interface Instrumented<T> extends WithLogId {
/**

17
core/src/main/java/io/grpc/internal/Channelz.java → core/src/main/java/io/grpc/InternalChannelz.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.grpc.internal;
package io.grpc;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkState;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import io.grpc.ConnectivityState;
import java.net.SocketAddress;
import java.security.cert.Certificate;
import java.util.ArrayList;
@ -42,9 +41,13 @@ import javax.annotation.concurrent.Immutable;
import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLSession;
public final class Channelz {
private static final Logger log = Logger.getLogger(Channelz.class.getName());
private static final Channelz INSTANCE = new Channelz();
/**
* This is an internal API. Do NOT use.
*/
@Internal
public final class InternalChannelz {
private static final Logger log = Logger.getLogger(InternalChannelz.class.getName());
private static final InternalChannelz INSTANCE = new InternalChannelz();
private final ConcurrentNavigableMap<Long, Instrumented<ServerStats>> servers
= new ConcurrentSkipListMap<Long, Instrumented<ServerStats>>();
@ -65,10 +68,10 @@ public final class Channelz {
}
@VisibleForTesting
public Channelz() {
public InternalChannelz() {
}
public static Channelz instance() {
public static InternalChannelz instance() {
return INSTANCE;
}

7
core/src/main/java/io/grpc/internal/LogId.java → core/src/main/java/io/grpc/LogId.java
View File

@ -14,13 +14,16 @@
* limitations under the License.
*/
package io.grpc.internal;
package io.grpc;
import java.util.concurrent.atomic.AtomicLong;
/**
* An object that has an ID that is unique within the JVM, primarily for debug logging.
* An internal class. Do not use.
*
*<p>An object that has an ID that is unique within the JVM, primarily for debug logging.
*/
@Internal
public final class LogId {
private static final AtomicLong idAlloc = new AtomicLong();

7
core/src/main/java/io/grpc/internal/WithLogId.java → core/src/main/java/io/grpc/WithLogId.java
View File

@ -14,11 +14,14 @@
* limitations under the License.
*/
package io.grpc.internal;
package io.grpc;
/**
* A loggable ID, unique for the duration of the program.
* An internal class. Do not use.
*
* <p>A loggable ID, unique for the duration of the program.
*/
@Internal
public interface WithLogId {
/**
* Returns an ID that is primarily used in debug logs. It usually contains the class name and a

4
core/src/main/java/io/grpc/inprocess/InProcessServer.java
View File

@ -19,9 +19,9 @@ package io.grpc.inprocess;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.MoreObjects;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.ServerStreamTracer;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Instrumented;
import io.grpc.internal.InternalServer;
import io.grpc.internal.ObjectPool;
import io.grpc.internal.ServerListener;

4
core/src/main/java/io/grpc/inprocess/InProcessTransport.java
View File

@ -31,17 +31,17 @@ import io.grpc.Deadline;
import io.grpc.Decompressor;
import io.grpc.DecompressorRegistry;
import io.grpc.Grpc;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.SecurityLevel;
import io.grpc.ServerStreamTracer;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.ClientStream;
import io.grpc.internal.ClientStreamListener;
import io.grpc.internal.ConnectionClientTransport;
import io.grpc.internal.GrpcUtil;
import io.grpc.internal.LogId;
import io.grpc.internal.ManagedClientTransport;
import io.grpc.internal.NoopClientStream;
import io.grpc.internal.ObjectPool;

3
core/src/main/java/io/grpc/internal/AbstractManagedChannelImplBuilder.java
View File

@ -27,6 +27,7 @@ import io.grpc.ClientInterceptor;
import io.grpc.CompressorRegistry;
import io.grpc.DecompressorRegistry;
import io.grpc.EquivalentAddressGroup;
import io.grpc.InternalChannelz;
import io.grpc.LoadBalancer;
import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
@ -134,7 +135,7 @@ public abstract class AbstractManagedChannelImplBuilder
// TODO(zdapeng): delete me
boolean temporarilyDisableRetry;
Channelz channelz = Channelz.instance();
InternalChannelz channelz = InternalChannelz.instance();
int maxTraceEvents;
protected TransportTracer.Factory transportTracerFactory = TransportTracer.getDefaultFactory();

3
core/src/main/java/io/grpc/internal/AbstractServerImplBuilder.java
View File

@ -28,6 +28,7 @@ import io.grpc.Context;
import io.grpc.DecompressorRegistry;
import io.grpc.HandlerRegistry;
import io.grpc.Internal;
import io.grpc.InternalChannelz;
import io.grpc.InternalNotifyOnServerBuild;
import io.grpc.Server;
import io.grpc.ServerBuilder;
@ -113,7 +114,7 @@ public abstract class AbstractServerImplBuilder<T extends AbstractServerImplBuil
protected BinaryLog binlog;
protected TransportTracer.Factory transportTracerFactory = TransportTracer.getDefaultFactory();
protected Channelz channelz = Channelz.instance();
protected InternalChannelz channelz = InternalChannelz.instance();
protected CallTracer.Factory callTracerFactory = CallTracer.getDefaultFactory();
@Override

3
core/src/main/java/io/grpc/internal/AbstractSubchannel.java
View File

@ -17,8 +17,9 @@
package io.grpc.internal;
import com.google.common.annotations.VisibleForTesting;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.LoadBalancer;
import io.grpc.internal.Channelz.ChannelStats;
import javax.annotation.Nullable;
/**

4
core/src/main/java/io/grpc/internal/CallTracer.java
View File

@ -18,8 +18,8 @@ package io.grpc.internal;
import static io.grpc.internal.TimeProvider.SYSTEM_TIME_PROVIDER;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ServerStats;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ServerStats;
/**
* A collection of call stats for channelz.

6
core/src/main/java/io/grpc/internal/ChannelTracer.java
View File

@ -19,9 +19,9 @@ package io.grpc.internal;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace;
import io.grpc.internal.Channelz.ChannelTrace.Event;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace;
import io.grpc.InternalChannelz.ChannelTrace.Event;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;

3
core/src/main/java/io/grpc/internal/ClientTransport.java
View File

@ -17,9 +17,10 @@
package io.grpc.internal;
import io.grpc.CallOptions;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.internal.Channelz.SocketStats;
import java.util.concurrent.Executor;
import javax.annotation.concurrent.ThreadSafe;

3
core/src/main/java/io/grpc/internal/DelayedClientTransport.java
View File

@ -21,13 +21,14 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.CallOptions;
import io.grpc.Context;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.PickSubchannelArgs;
import io.grpc.LoadBalancer.SubchannelPicker;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

3
core/src/main/java/io/grpc/internal/FailingClientTransport.java
View File

@ -21,10 +21,11 @@ import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.CallOptions;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.ClientStreamListener.RpcProgress;
import java.util.concurrent.Executor;

3
core/src/main/java/io/grpc/internal/ForwardingConnectionClientTransport.java
View File

@ -20,10 +20,11 @@ import com.google.common.base.MoreObjects;
import com.google.common.util.concurrent.ListenableFuture;
import io.grpc.Attributes;
import io.grpc.CallOptions;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import java.util.concurrent.Executor;
abstract class ForwardingConnectionClientTransport implements ConnectionClientTransport {

3
core/src/main/java/io/grpc/internal/GrpcUtil.java
View File

@ -29,14 +29,15 @@ import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import io.grpc.CallOptions;
import io.grpc.ClientStreamTracer;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalMetadata;
import io.grpc.InternalMetadata.TrustedAsciiMarshaller;
import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.Subchannel;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.ClientStreamListener.RpcProgress;
import io.grpc.internal.SharedResourceHolder.Resource;
import io.grpc.internal.StreamListener.MessageProducer;

3
core/src/main/java/io/grpc/internal/InternalServer.java
View File

@ -16,7 +16,8 @@
package io.grpc.internal;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz.SocketStats;
import java.io.IOException;
import java.util.List;
import javax.annotation.concurrent.ThreadSafe;

12
core/src/main/java/io/grpc/internal/InternalSubchannel.java
View File

@ -35,11 +35,15 @@ import io.grpc.CallOptions;
import io.grpc.ConnectivityState;
import io.grpc.ConnectivityStateInfo;
import io.grpc.EquivalentAddressGroup;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Status;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace;
import io.grpc.WithLogId;
import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.Collection;
@ -69,7 +73,7 @@ final class InternalSubchannel implements Instrumented<ChannelStats> {
private final Callback callback;
private final ClientTransportFactory transportFactory;
private final ScheduledExecutorService scheduledExecutor;
private final Channelz channelz;
private final InternalChannelz channelz;
private final CallTracer callsTracer;
@CheckForNull
private final ChannelTracer channelTracer;
@ -162,7 +166,7 @@ final class InternalSubchannel implements Instrumented<ChannelStats> {
BackoffPolicy.Provider backoffPolicyProvider,
ClientTransportFactory transportFactory, ScheduledExecutorService scheduledExecutor,
Supplier<Stopwatch> stopwatchSupplier, ChannelExecutor channelExecutor, Callback callback,
Channelz channelz, CallTracer callsTracer, @Nullable ChannelTracer channelTracer,
InternalChannelz channelz, CallTracer callsTracer, @Nullable ChannelTracer channelTracer,
TimeProvider timeProvider) {
Preconditions.checkNotNull(addressGroups, "addressGroups");
Preconditions.checkArgument(!addressGroups.isEmpty(), "addressGroups is empty");

12
core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
View File

@ -44,17 +44,21 @@ import io.grpc.ConnectivityStateInfo;
import io.grpc.Context;
import io.grpc.DecompressorRegistry;
import io.grpc.EquivalentAddressGroup;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace;
import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.PickSubchannelArgs;
import io.grpc.LoadBalancer.SubchannelPicker;
import io.grpc.LogId;
import io.grpc.ManagedChannel;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.NameResolver;
import io.grpc.Status;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace;
import io.grpc.WithLogId;
import io.grpc.internal.ClientCallImpl.ClientTransportProvider;
import io.grpc.internal.RetriableStream.ChannelBufferMeter;
import io.grpc.internal.RetriableStream.Throttle;
@ -211,7 +215,7 @@ final class ManagedChannelImpl extends ManagedChannel implements Instrumented<Ch
private final CallTracer channelCallTracer;
@CheckForNull
private final ChannelTracer channelTracer;
private final Channelz channelz;
private final InternalChannelz channelz;
@CheckForNull
private Boolean haveBackends; // a flag for doing channel tracing when flipped
@Nullable
@ -297,7 +301,7 @@ final class ManagedChannelImpl extends ManagedChannel implements Instrumented<Ch
channelExecutor.executeLater(new Runnable() {
@Override
public void run() {
ChannelStats.Builder builder = new Channelz.ChannelStats.Builder();
ChannelStats.Builder builder = new InternalChannelz.ChannelStats.Builder();
channelCallTracer.updateBuilder(builder);
if (channelTracer != null) {
channelTracer.updateBuilder(builder);

12
core/src/main/java/io/grpc/internal/OobChannel.java
View File

@ -30,17 +30,21 @@ import io.grpc.ConnectivityState;
import io.grpc.ConnectivityStateInfo;
import io.grpc.Context;
import io.grpc.EquivalentAddressGroup;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace;
import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.PickSubchannelArgs;
import io.grpc.LoadBalancer.Subchannel;
import io.grpc.LoadBalancer.SubchannelPicker;
import io.grpc.LogId;
import io.grpc.ManagedChannel;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Status;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace;
import io.grpc.WithLogId;
import io.grpc.internal.ClientCallImpl.ClientTransportProvider;
import java.util.Collections;
import java.util.List;
@ -69,7 +73,7 @@ final class OobChannel extends ManagedChannel implements Instrumented<ChannelSta
private final LogId logId = LogId.allocate(getClass().getName());
private final String authority;
private final DelayedClientTransport delayedTransport;
private final Channelz channelz;
private final InternalChannelz channelz;
private final ObjectPool<? extends Executor> executorPool;
private final Executor executor;
private final ScheduledExecutorService deadlineCancellationExecutor;
@ -99,7 +103,7 @@ final class OobChannel extends ManagedChannel implements Instrumented<ChannelSta
OobChannel(
String authority, ObjectPool<? extends Executor> executorPool,
ScheduledExecutorService deadlineCancellationExecutor, ChannelExecutor channelExecutor,
CallTracer callsTracer, @Nullable ChannelTracer channelTracer, Channelz channelz,
CallTracer callsTracer, @Nullable ChannelTracer channelTracer, InternalChannelz channelz,
TimeProvider timeProvider) {
this.authority = checkNotNull(authority, "authority");
this.executorPool = checkNotNull(executorPool, "executorPool");

7
core/src/main/java/io/grpc/internal/ServerImpl.java
View File

@ -36,7 +36,11 @@ import io.grpc.Context;
import io.grpc.Decompressor;
import io.grpc.DecompressorRegistry;
import io.grpc.HandlerRegistry;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalServerInterceptors;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.ServerCall;
import io.grpc.ServerCallHandler;
@ -45,7 +49,6 @@ import io.grpc.ServerMethodDefinition;
import io.grpc.ServerServiceDefinition;
import io.grpc.ServerTransportFilter;
import io.grpc.Status;
import io.grpc.internal.Channelz.ServerStats;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@ -111,7 +114,7 @@ public final class ServerImpl extends io.grpc.Server implements Instrumented<Ser
private final CompressorRegistry compressorRegistry;
private final BinaryLog binlog;
private final Channelz channelz;
private final InternalChannelz channelz;
private final CallTracer serverCallTracer;
/**

3
core/src/main/java/io/grpc/internal/ServerTransport.java
View File

@ -16,8 +16,9 @@
package io.grpc.internal;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import java.util.concurrent.ScheduledExecutorService;
/** An inbound connection. */

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

@ -20,7 +20,7 @@ import static io.grpc.internal.TimeProvider.SYSTEM_TIME_PROVIDER;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.grpc.internal.Channelz.TransportStats;
import io.grpc.InternalChannelz.TransportStats;
/**
* A class for gathering statistics about a transport. This is an experimental feature.

22
core/src/test/java/io/grpc/internal/ChannelzTest.java → core/src/test/java/io/grpc/InternalChannelzTest.java
View File

@ -14,10 +14,10 @@
* limitations under the License.
*/
package io.grpc.internal;
package io.grpc;
import static com.google.common.truth.Truth.assertThat;
import static io.grpc.internal.Channelz.id;
import static io.grpc.InternalChannelz.id;
import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -28,13 +28,13 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.google.common.util.concurrent.ListenableFuture;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.RootChannelList;
import io.grpc.internal.Channelz.ServerList;
import io.grpc.internal.Channelz.ServerSocketsList;
import io.grpc.internal.Channelz.ServerStats;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Channelz.Tls;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.RootChannelList;
import io.grpc.InternalChannelz.ServerList;
import io.grpc.InternalChannelz.ServerSocketsList;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalChannelz.Tls;
import java.security.cert.Certificate;
import javax.net.ssl.SSLSession;
import org.junit.Test;
@ -42,9 +42,9 @@ import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public final class ChannelzTest {
public final class InternalChannelzTest {
private final Channelz channelz = new Channelz();
private final InternalChannelz channelz = new InternalChannelz();
@Test
public void getRootChannels_empty() {

6
core/src/test/java/io/grpc/internal/ChannelTracerTest.java
View File

@ -18,9 +18,9 @@ package io.grpc.internal;
import static com.google.common.truth.Truth.assertThat;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace.Event;
import io.grpc.internal.Channelz.ChannelTrace.Event.Severity;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace.Event;
import io.grpc.InternalChannelz.ChannelTrace.Event.Severity;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;

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

@ -41,7 +41,9 @@ import com.google.common.collect.Iterables;
import io.grpc.Attributes;
import io.grpc.ConnectivityStateInfo;
import io.grpc.EquivalentAddressGroup;
import io.grpc.InternalChannelz;
import io.grpc.Status;
import io.grpc.WithLogId;
import io.grpc.internal.InternalSubchannel.CallTracingTransport;
import io.grpc.internal.InternalSubchannel.Index;
import io.grpc.internal.TestUtils.MockClientTransportInfo;
@ -79,7 +81,7 @@ public class InternalSubchannelTest {
private final FakeClock fakeExecutor = new FakeClock();
private final ChannelExecutor channelExecutor = new ChannelExecutor();
private final Channelz channelz = new Channelz();
private final InternalChannelz channelz = new InternalChannelz();
@Mock private BackoffPolicy mockBackoffPolicy1;
@Mock private BackoffPolicy mockBackoffPolicy2;

8
core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java
View File

@ -68,7 +68,11 @@ import io.grpc.ConnectivityState;
import io.grpc.ConnectivityStateInfo;
import io.grpc.Context;
import io.grpc.EquivalentAddressGroup;
import io.grpc.Instrumented;
import io.grpc.IntegerMarshaller;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace;
import io.grpc.LoadBalancer;
import io.grpc.LoadBalancer.Helper;
import io.grpc.LoadBalancer.PickResult;
@ -84,8 +88,6 @@ import io.grpc.SecurityLevel;
import io.grpc.ServerMethodDefinition;
import io.grpc.Status;
import io.grpc.StringMarshaller;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace;
import io.grpc.internal.ClientTransportFactory.ClientTransportOptions;
import io.grpc.internal.TestUtils.MockClientTransportInfo;
import io.grpc.stub.ClientCalls;
@ -165,7 +167,7 @@ public class ManagedChannelImplTest {
}
};
private final Channelz channelz = new Channelz();
private final InternalChannelz channelz = new InternalChannelz();
@Rule public final ExpectedException thrown = ExpectedException.none();

2
core/src/test/java/io/grpc/internal/MessageDeframerTest.java
View File

@ -35,9 +35,9 @@ import com.google.common.base.Charsets;
import com.google.common.io.ByteStreams;
import com.google.common.primitives.Bytes;
import io.grpc.Codec;
import io.grpc.InternalChannelz.TransportStats;
import io.grpc.StatusRuntimeException;
import io.grpc.StreamTracer;
import io.grpc.internal.Channelz.TransportStats;
import io.grpc.internal.MessageDeframer.Listener;
import io.grpc.internal.MessageDeframer.SizeEnforcingInputStream;
import io.grpc.internal.testing.TestStreamTracer.TestBaseStreamTracer;

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

@ -34,14 +34,14 @@ import com.google.common.io.CharStreams;
import io.grpc.CompressorRegistry;
import io.grpc.Context;
import io.grpc.DecompressorRegistry;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalChannelz.ServerStats.Builder;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.MethodDescriptor.Marshaller;
import io.grpc.MethodDescriptor.MethodType;
import io.grpc.ServerCall;
import io.grpc.Status;
import io.grpc.internal.Channelz.ServerStats;
import io.grpc.internal.Channelz.ServerStats.Builder;
import io.grpc.internal.ServerCallImpl.ServerStreamListenerImpl;
import io.grpc.internal.testing.SingleMessageProducer;
import java.io.ByteArrayInputStream;

11
core/src/test/java/io/grpc/internal/ServerImplTest.java
View File

@ -17,7 +17,7 @@
package io.grpc.internal;
import static com.google.common.truth.Truth.assertThat;
import static io.grpc.internal.Channelz.id;
import static io.grpc.InternalChannelz.id;
import static io.grpc.internal.GrpcUtil.MESSAGE_ENCODING_KEY;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@ -54,8 +54,13 @@ import io.grpc.Compressor;
import io.grpc.Context;
import io.grpc.Grpc;
import io.grpc.HandlerRegistry;
import io.grpc.Instrumented;
import io.grpc.IntegerMarshaller;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ServerSocketsList;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalServerInterceptors;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.ServerCall;
@ -69,8 +74,6 @@ import io.grpc.ServerTransportFilter;
import io.grpc.ServiceDescriptor;
import io.grpc.Status;
import io.grpc.StringMarshaller;
import io.grpc.internal.Channelz.ServerSocketsList;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.ServerImpl.JumpToApplicationThreadServerStreamListener;
import io.grpc.internal.testing.SingleMessageProducer;
import io.grpc.internal.testing.TestServerStreamTracer;
@ -142,7 +145,7 @@ public class ServerImplTest {
private final FakeClock executor = new FakeClock();
private final FakeClock timer = new FakeClock();
private final Channelz channelz = new Channelz();
private final InternalChannelz channelz = new InternalChannelz();
@Mock
private ServerStreamTracer.Factory streamTracerFactory;

1
core/src/test/java/io/grpc/internal/TestUtils.java
View File

@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import io.grpc.CallOptions;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import java.net.SocketAddress;

4
cronet/src/main/java/io/grpc/cronet/CronetClientTransport.java
View File

@ -22,16 +22,16 @@ import com.google.common.util.concurrent.SettableFuture;
import io.grpc.Attributes;
import io.grpc.CallCredentials;
import io.grpc.CallOptions;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.SecurityLevel;
import io.grpc.Status;
import io.grpc.Status.Code;
import io.grpc.cronet.CronetChannelBuilder.StreamBuilderFactory;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.ConnectionClientTransport;
import io.grpc.internal.GrpcUtil;
import io.grpc.internal.LogId;
import io.grpc.internal.StatsTraceContext;
import io.grpc.internal.TransportTracer;
import java.net.InetSocketAddress;

4
grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java
View File

@ -23,13 +23,13 @@ import io.grpc.Attributes;
import io.grpc.ConnectivityStateInfo;
import io.grpc.EquivalentAddressGroup;
import io.grpc.LoadBalancer;
import io.grpc.LogId;
import io.grpc.Status;
import io.grpc.WithLogId;
import io.grpc.internal.BackoffPolicy;
import io.grpc.internal.GrpcAttributes;
import io.grpc.internal.LogId;
import io.grpc.internal.ObjectPool;
import io.grpc.internal.TimeProvider;
import io.grpc.internal.WithLogId;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

2
grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java
View File

@ -38,12 +38,12 @@ import io.grpc.LoadBalancer.PickResult;
import io.grpc.LoadBalancer.PickSubchannelArgs;
import io.grpc.LoadBalancer.Subchannel;
import io.grpc.LoadBalancer.SubchannelPicker;
import io.grpc.LogId;
import io.grpc.ManagedChannel;
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.internal.BackoffPolicy;
import io.grpc.internal.GrpcAttributes;
import io.grpc.internal.LogId;
import io.grpc.internal.TimeProvider;
import io.grpc.lb.v1.ClientStats;
import io.grpc.lb.v1.InitialLoadBalanceRequest;

9
netty/src/main/java/io/grpc/netty/GrpcHttp2ConnectionHandler.java
View File

@ -18,7 +18,7 @@ package io.grpc.netty;
import io.grpc.Attributes;
import io.grpc.Internal;
import io.grpc.internal.Channelz;
import io.grpc.InternalChannelz;
import io.netty.channel.ChannelPromise;
import io.netty.handler.codec.http2.Http2ConnectionDecoder;
import io.netty.handler.codec.http2.Http2ConnectionEncoder;
@ -45,8 +45,8 @@ public abstract class GrpcHttp2ConnectionHandler extends Http2ConnectionHandler
}
/**
* Same as {@link #handleProtocolNegotiationCompleted(Attributes, Channelz.Security)}
* but with no {@link io.grpc.internal.Channelz.Security}.
* Same as {@link #handleProtocolNegotiationCompleted(Attributes, InternalChannelz.Security)}
* but with no {@link InternalChannelz.Security}.
*
* @deprecated Use the two argument method instead.
*/
@ -64,7 +64,8 @@ public abstract class GrpcHttp2ConnectionHandler extends Http2ConnectionHandler
* @param attrs arbitrary attributes passed after protocol negotiation (eg. SSLSession).
* @param securityInfo informs channelz about the security protocol.
*/
public void handleProtocolNegotiationCompleted(Attributes attrs, Channelz.Security securityInfo) {
public void handleProtocolNegotiationCompleted(
Attributes attrs, InternalChannelz.Security securityInfo) {
}
/**

2
netty/src/main/java/io/grpc/netty/InternalNettySocketSupport.java
View File

@ -17,7 +17,7 @@
package io.grpc.netty;
import io.grpc.Internal;
import io.grpc.internal.Channelz.TcpInfo;
import io.grpc.InternalChannelz.TcpInfo;
import java.util.Map;
/**

8
netty/src/main/java/io/grpc/netty/NettyClientHandler.java
View File

@ -24,10 +24,10 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
import io.grpc.Attributes;
import io.grpc.InternalChannelz;
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.StatusException;
import io.grpc.internal.Channelz;
import io.grpc.internal.ClientStreamListener.RpcProgress;
import io.grpc.internal.ClientTransport.PingCallback;
import io.grpc.internal.GrpcUtil;
@ -106,7 +106,7 @@ class NettyClientHandler extends AbstractNettyHandler {
private WriteQueue clientWriteQueue;
private Http2Ping ping;
private Attributes attributes = Attributes.EMPTY;
private Channelz.Security securityInfo;
private InternalChannelz.Security securityInfo;
static NettyClientHandler newHandler(
ClientTransportLifecycleManager lifecycleManager,
@ -418,7 +418,7 @@ class NettyClientHandler extends AbstractNettyHandler {
@Override
public void handleProtocolNegotiationCompleted(
Attributes attributes, Channelz.Security securityInfo) {
Attributes attributes, InternalChannelz.Security securityInfo) {
this.attributes = attributes;
this.securityInfo = securityInfo;
super.handleProtocolNegotiationCompleted(attributes, securityInfo);
@ -429,7 +429,7 @@ class NettyClientHandler extends AbstractNettyHandler {
return eagAttributes;
}
Channelz.Security getSecurityInfo() {
InternalChannelz.Security getSecurityInfo() {
return securityInfo;
}

4
netty/src/main/java/io/grpc/netty/NettyClientTransport.java
View File

@ -26,10 +26,11 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.Attributes;
import io.grpc.CallOptions;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.ClientStream;
import io.grpc.internal.ConnectionClientTransport;
import io.grpc.internal.FailingClientStream;
@ -37,7 +38,6 @@ import io.grpc.internal.GrpcUtil;
import io.grpc.internal.Http2Ping;
import io.grpc.internal.KeepAliveManager;
import io.grpc.internal.KeepAliveManager.ClientKeepAlivePinger;
import io.grpc.internal.LogId;
import io.grpc.internal.StatsTraceContext;
import io.grpc.internal.TransportTracer;
import io.netty.bootstrap.Bootstrap;

14
netty/src/main/java/io/grpc/netty/NettyServer.java
View File

@ -26,17 +26,17 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.ServerStreamTracer;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Instrumented;
import io.grpc.WithLogId;
import io.grpc.internal.InternalServer;
import io.grpc.internal.LogId;
import io.grpc.internal.ServerListener;
import io.grpc.internal.ServerTransportListener;
import io.grpc.internal.SharedResourceHolder;
import io.grpc.internal.TransportTracer;
import io.grpc.internal.WithLogId;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
@ -92,7 +92,7 @@ class NettyServer implements InternalServer, WithLogId {
private final ReferenceCounted eventLoopReferenceCounter = new EventLoopReferenceCounter();
private final List<ServerStreamTracer.Factory> streamTracerFactories;
private final TransportTracer.Factory transportTracerFactory;
private final Channelz channelz;
private final InternalChannelz channelz;
// Only modified in event loop but safe to read any time. Set at startup and unset at shutdown.
// In the future we may have >1 listen socket.
private volatile ImmutableList<Instrumented<SocketStats>> listenSockets = ImmutableList.of();
@ -108,7 +108,7 @@ class NettyServer implements InternalServer, WithLogId {
long maxConnectionIdleInNanos,
long maxConnectionAgeInNanos, long maxConnectionAgeGraceInNanos,
boolean permitKeepAliveWithoutCalls, long permitKeepAliveTimeInNanos,
Channelz channelz) {
InternalChannelz channelz) {
this.address = address;
this.channelType = checkNotNull(channelType, "channelType");
checkNotNull(channelOptions, "channelOptions");

8
netty/src/main/java/io/grpc/netty/NettyServerHandler.java
View File

@ -31,12 +31,12 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import io.grpc.Attributes;
import io.grpc.InternalChannelz;
import io.grpc.InternalMetadata;
import io.grpc.InternalStatus;
import io.grpc.Metadata;
import io.grpc.ServerStreamTracer;
import io.grpc.Status;
import io.grpc.internal.Channelz;
import io.grpc.internal.GrpcUtil;
import io.grpc.internal.KeepAliveManager;
import io.grpc.internal.LogExceptionRunnable;
@ -113,7 +113,7 @@ class NettyServerHandler extends AbstractNettyHandler {
private final KeepAliveEnforcer keepAliveEnforcer;
/** Incomplete attributes produced by negotiator. */
private Attributes negotiationAttributes;
private Channelz.Security securityInfo;
private InternalChannelz.Security securityInfo;
/** Completed attributes produced by transportReady. */
private Attributes attributes;
private Throwable connectionError;
@ -507,12 +507,12 @@ class NettyServerHandler extends AbstractNettyHandler {
@Override
public void handleProtocolNegotiationCompleted(
Attributes attrs, Channelz.Security securityInfo) {
Attributes attrs, InternalChannelz.Security securityInfo) {
negotiationAttributes = attrs;
this.securityInfo = securityInfo;
}
Channelz.Security getSecurityInfo() {
InternalChannelz.Security getSecurityInfo() {
return securityInfo;
}

4
netty/src/main/java/io/grpc/netty/NettyServerTransport.java
View File

@ -22,10 +22,10 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.ServerStreamTracer;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.LogId;
import io.grpc.internal.ServerTransport;
import io.grpc.internal.ServerTransportListener;
import io.grpc.internal.TransportTracer;

2
netty/src/main/java/io/grpc/netty/NettySocketSupport.java
View File

@ -18,7 +18,7 @@ package io.grpc.netty;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import io.grpc.internal.Channelz.TcpInfo;
import io.grpc.InternalChannelz.TcpInfo;
import io.netty.channel.Channel;
import java.util.Map;
import javax.annotation.Nullable;

6
netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java
View File

@ -25,9 +25,9 @@ import io.grpc.Attributes;
import io.grpc.CallCredentials;
import io.grpc.Grpc;
import io.grpc.Internal;
import io.grpc.InternalChannelz;
import io.grpc.SecurityLevel;
import io.grpc.Status;
import io.grpc.internal.Channelz;
import io.grpc.internal.GrpcUtil;
import io.netty.channel.ChannelDuplexHandler;
import io.netty.channel.ChannelFuture;
@ -158,7 +158,7 @@ public final class ProtocolNegotiators {
.set(Grpc.TRANSPORT_ATTR_SSL_SESSION, session)
.set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, ctx.channel().remoteAddress())
.build(),
new Channelz.Security(new Channelz.Tls(session)));
new InternalChannelz.Security(new InternalChannelz.Tls(session)));
// Replace this handler with the GRPC handler.
ctx.pipeline().replace(this, null, grpcHandler);
} else {
@ -649,7 +649,7 @@ public final class ProtocolNegotiators {
.set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, ctx.channel().remoteAddress())
.set(CallCredentials.ATTR_SECURITY_LEVEL, SecurityLevel.PRIVACY_AND_INTEGRITY)
.build(),
new Channelz.Security(new Channelz.Tls(session)));
new InternalChannelz.Security(new InternalChannelz.Tls(session)));
writeBufferedAndRemove(ctx);
} else {
Exception ex = new Exception(

6
netty/src/main/java/io/grpc/netty/Utils.java
View File

@ -25,10 +25,10 @@ import static io.netty.util.CharsetUtil.UTF_8;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import io.grpc.InternalChannelz;
import io.grpc.InternalMetadata;
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.internal.Channelz;
import io.grpc.internal.GrpcUtil;
import io.grpc.internal.SharedResourceHolder.Resource;
import io.grpc.netty.GrpcHttp2HeadersUtils.GrpcHttp2InboundHeaders;
@ -209,9 +209,9 @@ class Utils {
}
}
static Channelz.SocketOptions getSocketOptions(Channel channel) {
static InternalChannelz.SocketOptions getSocketOptions(Channel channel) {
ChannelConfig config = channel.config();
Channelz.SocketOptions.Builder b = new Channelz.SocketOptions.Builder();
InternalChannelz.SocketOptions.Builder b = new InternalChannelz.SocketOptions.Builder();
// The API allows returning null but not sure if it can happen in practice.
// Let's be paranoid and do null checking just in case.

4
netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java
View File

@ -40,6 +40,7 @@ import com.google.common.util.concurrent.SettableFuture;
import io.grpc.Attributes;
import io.grpc.CallOptions;
import io.grpc.Grpc;
import io.grpc.InternalChannelz;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.MethodDescriptor.Marshaller;
@ -47,7 +48,6 @@ import io.grpc.ServerStreamTracer;
import io.grpc.Status;
import io.grpc.Status.Code;
import io.grpc.StatusException;
import io.grpc.internal.Channelz;
import io.grpc.internal.ClientStream;
import io.grpc.internal.ClientStreamListener;
import io.grpc.internal.ClientTransport;
@ -107,7 +107,7 @@ public class NettyClientTransportTest {
private final List<NettyClientTransport> transports = new ArrayList<NettyClientTransport>();
private final NioEventLoopGroup group = new NioEventLoopGroup(1);
private final EchoServerListener serverListener = new EchoServerListener();
private final Channelz channelz = new Channelz();
private final InternalChannelz channelz = new InternalChannelz();
private Runnable tooManyPingsRunnable = new Runnable() {
// Throwing is useless in this method, because Netty doesn't propagate the exception
@Override public void run() {}

2
netty/src/test/java/io/grpc/netty/NettyHandlerTestBase.java
View File

@ -29,7 +29,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.grpc.internal.Channelz.TransportStats;
import io.grpc.InternalChannelz.TransportStats;
import io.grpc.internal.FakeClock;
import io.grpc.internal.MessageFramer;
import io.grpc.internal.StatsTraceContext;

11
netty/src/test/java/io/grpc/netty/NettyServerTest.java
View File

@ -18,16 +18,16 @@ package io.grpc.netty;
import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.common.truth.Truth.assertThat;
import static io.grpc.internal.Channelz.id;
import static io.grpc.InternalChannelz.id;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.ServerStreamTracer;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Instrumented;
import io.grpc.internal.ServerListener;
import io.grpc.internal.ServerTransport;
import io.grpc.internal.ServerTransportListener;
@ -43,14 +43,13 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class NettyServerTest {
private final Channelz channelz = new Channelz();
private final InternalChannelz channelz = new InternalChannelz();
@Test
public void getPort() throws Exception {

10
netty/src/test/java/io/grpc/netty/UtilsTest.java
View File

@ -22,10 +22,10 @@ import static org.junit.Assert.assertSame;
import com.google.common.base.MoreObjects;
import com.google.common.truth.Truth;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.SocketOptions;
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.SocketOptions;
import io.grpc.internal.GrpcUtil;
import io.netty.channel.Channel;
import io.netty.channel.ChannelOption;
@ -131,7 +131,7 @@ public class UtilsTest {
public void channelOptionsTest_noLinger() {
Channel channel = new EmbeddedChannel();
assertNull(channel.config().getOption(ChannelOption.SO_LINGER));
Channelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
InternalChannelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
assertNull(socketOptions.lingerSeconds);
}
@ -149,7 +149,7 @@ public class UtilsTest {
assertNull(socketOptions.soTimeoutMillis);
}
private static Channelz.SocketOptions setAndValidateGeneric(Channel channel) {
private static InternalChannelz.SocketOptions setAndValidateGeneric(Channel channel) {
channel.config().setOption(ChannelOption.SO_LINGER, 3);
// only applicable for OIO channels:
channel.config().setOption(ChannelOption.SO_TIMEOUT, 250);
@ -158,7 +158,7 @@ public class UtilsTest {
WriteBufferWaterMark writeBufWaterMark = new WriteBufferWaterMark(10, 20);
channel.config().setOption(ChannelOption.WRITE_BUFFER_WATER_MARK, writeBufWaterMark);
Channelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
InternalChannelz.SocketOptions socketOptions = Utils.getSocketOptions(channel);
assertEquals(3, (int) socketOptions.lingerSeconds);
assertEquals("true", socketOptions.others.get("SO_KEEPALIVE"));
assertEquals(

12
okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java
View File

@ -34,6 +34,9 @@ import io.grpc.Attributes;
import io.grpc.CallCredentials;
import io.grpc.CallOptions;
import io.grpc.Grpc;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.LogId;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.MethodDescriptor.MethodType;
@ -41,15 +44,12 @@ import io.grpc.SecurityLevel;
import io.grpc.Status;
import io.grpc.Status.Code;
import io.grpc.StatusException;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.ClientStreamListener.RpcProgress;
import io.grpc.internal.ConnectionClientTransport;
import io.grpc.internal.GrpcUtil;
import io.grpc.internal.Http2Ping;
import io.grpc.internal.KeepAliveManager;
import io.grpc.internal.KeepAliveManager.ClientKeepAlivePinger;
import io.grpc.internal.LogId;
import io.grpc.internal.ProxyParameters;
import io.grpc.internal.SerializingExecutor;
import io.grpc.internal.SharedResourceHolder;
@ -192,7 +192,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
@GuardedBy("lock")
private final TransportTracer transportTracer;
@GuardedBy("lock")
private Channelz.Security securityInfo;
private InternalChannelz.Security securityInfo;
@VisibleForTesting
@Nullable
@ -505,7 +505,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
maxConcurrentStreams = Integer.MAX_VALUE;
startPendingStreams();
if (sslSession != null) {
securityInfo = new Channelz.Security(new Channelz.Tls(sslSession));
securityInfo = new InternalChannelz.Security(new InternalChannelz.Tls(sslSession));
}
}
@ -930,7 +930,7 @@ class OkHttpClientTransport implements ConnectionClientTransport, TransportExcep
transportTracer.getStats(),
/*local=*/ null,
/*remote=*/ null,
new Channelz.SocketOptions.Builder().build(),
new InternalChannelz.SocketOptions.Builder().build(),
/*security=*/ null));
} else {
ret.set(new SocketStats(

8
okhttp/src/main/java/io/grpc/okhttp/Utils.java
View File

@ -17,9 +17,9 @@
package io.grpc.okhttp;
import com.google.common.base.Preconditions;
import io.grpc.InternalChannelz;
import io.grpc.InternalMetadata;
import io.grpc.Metadata;
import io.grpc.internal.Channelz;
import io.grpc.internal.TransportFrameUtil;
import io.grpc.okhttp.internal.CipherSuite;
import io.grpc.okhttp.internal.ConnectionSpec;
@ -88,11 +88,11 @@ class Utils {
/**
* Attempts to capture all known socket options and return the results as a
* {@link Channelz.SocketOptions}. If getting a socket option threw an exception,
* {@link InternalChannelz.SocketOptions}. If getting a socket option threw an exception,
* log the error to the logger and report the value as an error in the response.
*/
static Channelz.SocketOptions getSocketOptions(Socket socket) {
Channelz.SocketOptions.Builder builder = new Channelz.SocketOptions.Builder();
static InternalChannelz.SocketOptions getSocketOptions(Socket socket) {
InternalChannelz.SocketOptions.Builder builder = new InternalChannelz.SocketOptions.Builder();
try {
builder.setSocketOptionLingerSeconds(socket.getSoLinger());
} catch (SocketException e) {

6
okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportTest.java
View File

@ -55,6 +55,9 @@ import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.CallOptions;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalChannelz.TransportStats;
import io.grpc.InternalStatus;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
@ -63,12 +66,9 @@ import io.grpc.Status;
import io.grpc.Status.Code;
import io.grpc.StatusException;
import io.grpc.internal.AbstractStream;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Channelz.TransportStats;
import io.grpc.internal.ClientStreamListener;
import io.grpc.internal.ClientTransport;
import io.grpc.internal.GrpcUtil;
import io.grpc.internal.Instrumented;
import io.grpc.internal.ManagedClientTransport;
import io.grpc.internal.ProxyParameters;
import io.grpc.internal.TransportTracer;

2
okhttp/src/test/java/io/grpc/okhttp/UtilsTest.java
View File

@ -19,7 +19,7 @@ package io.grpc.okhttp;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import io.grpc.internal.Channelz.SocketOptions;
import io.grpc.InternalChannelz.SocketOptions;
import io.grpc.okhttp.internal.CipherSuite;
import io.grpc.okhttp.internal.ConnectionSpec;
import io.grpc.okhttp.internal.TlsVersion;

32
services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
View File

@ -24,7 +24,18 @@ import com.google.protobuf.Int64Value;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import io.grpc.ConnectivityState;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace.Event;
import io.grpc.InternalChannelz.RootChannelList;
import io.grpc.InternalChannelz.ServerList;
import io.grpc.InternalChannelz.ServerSocketsList;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalChannelz.TransportStats;
import io.grpc.Status;
import io.grpc.WithLogId;
import io.grpc.channelz.v1.Address;
import io.grpc.channelz.v1.Address.OtherAddress;
import io.grpc.channelz.v1.Address.TcpIpAddress;
@ -56,17 +67,6 @@ import io.grpc.channelz.v1.SocketOptionTimeout;
import io.grpc.channelz.v1.SocketRef;
import io.grpc.channelz.v1.Subchannel;
import io.grpc.channelz.v1.SubchannelRef;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace.Event;
import io.grpc.internal.Channelz.RootChannelList;
import io.grpc.internal.Channelz.ServerList;
import io.grpc.internal.Channelz.ServerSocketsList;
import io.grpc.internal.Channelz.ServerStats;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Channelz.TransportStats;
import io.grpc.internal.Instrumented;
import io.grpc.internal.WithLogId;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.security.cert.CertificateEncodingException;
@ -142,7 +142,7 @@ final class ChannelzProtoUtil {
.build();
}
static Security toSecurity(Channelz.Security security) {
static Security toSecurity(InternalChannelz.Security security) {
Preconditions.checkNotNull(security);
Preconditions.checkState(
security.tls != null ^ security.other != null,
@ -276,7 +276,7 @@ final class ChannelzProtoUtil {
.build();
}
static SocketOption toSocketOptionTcpInfo(Channelz.TcpInfo i) {
static SocketOption toSocketOptionTcpInfo(InternalChannelz.TcpInfo i) {
SocketOptionTcpInfo tcpInfo = SocketOptionTcpInfo.newBuilder()
.setTcpiState(i.state)
.setTcpiCaState(i.caState)
@ -321,7 +321,7 @@ final class ChannelzProtoUtil {
return SocketOption.newBuilder().setName(name).setValue(value).build();
}
static List<SocketOption> toSocketOptionsList(Channelz.SocketOptions options) {
static List<SocketOption> toSocketOptionsList(InternalChannelz.SocketOptions options) {
Preconditions.checkNotNull(options);
List<SocketOption> ret = new ArrayList<SocketOption>();
if (options.lingerSeconds != null) {
@ -352,7 +352,7 @@ final class ChannelzProtoUtil {
return channelBuilder.build();
}
static ChannelData extractChannelData(Channelz.ChannelStats stats) {
static ChannelData extractChannelData(InternalChannelz.ChannelStats stats) {
ChannelData.Builder builder = ChannelData.newBuilder();
builder.setTarget(stats.target)
.setState(toChannelConnectivityState(stats.state))
@ -370,7 +370,7 @@ final class ChannelzProtoUtil {
return ChannelConnectivityState.newBuilder().setState(toState(s)).build();
}
private static ChannelTrace toChannelTrace(Channelz.ChannelTrace channelTrace) {
private static ChannelTrace toChannelTrace(InternalChannelz.ChannelTrace channelTrace) {
return ChannelTrace.newBuilder()
.setNumEventsLogged(channelTrace.numEventsLogged)
.setCreationTimestamp(Timestamps.fromNanos(channelTrace.creationTimeNanos))

22
services/src/main/java/io/grpc/services/ChannelzService.java
View File

@ -18,6 +18,12 @@ package io.grpc.services;
import com.google.common.annotations.VisibleForTesting;
import io.grpc.ExperimentalApi;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ServerList;
import io.grpc.InternalChannelz.ServerSocketsList;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.ServerInterceptors;
import io.grpc.ServerServiceDefinition;
import io.grpc.Status;
@ -34,12 +40,6 @@ import io.grpc.channelz.v1.GetSubchannelRequest;
import io.grpc.channelz.v1.GetSubchannelResponse;
import io.grpc.channelz.v1.GetTopChannelsRequest;
import io.grpc.channelz.v1.GetTopChannelsResponse;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ServerList;
import io.grpc.internal.Channelz.ServerSocketsList;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Instrumented;
import io.grpc.stub.StreamObserver;
/**
@ -47,7 +47,7 @@ import io.grpc.stub.StreamObserver;
*/
@ExperimentalApi("https://github.com/grpc/grpc-java/issues/4206")
public final class ChannelzService extends ChannelzGrpc.ChannelzImplBase {
private final Channelz channelz;
private final InternalChannelz channelz;
private final int maxPageSize;
/**
@ -56,7 +56,7 @@ public final class ChannelzService extends ChannelzGrpc.ChannelzImplBase {
*/
@Deprecated
public static ChannelzService newInstance(int maxPageSize) {
return new ChannelzService(Channelz.instance(), maxPageSize);
return new ChannelzService(InternalChannelz.instance(), maxPageSize);
}
/**
@ -67,12 +67,12 @@ public final class ChannelzService extends ChannelzGrpc.ChannelzImplBase {
*/
public static ServerServiceDefinition createInstance(int maxPageSize) {
return ServerInterceptors.intercept(
new ChannelzService(Channelz.instance(), maxPageSize),
new ChannelzService(InternalChannelz.instance(), maxPageSize),
new RequireDoubleSubmitCookieInterceptor("grpc-channelz-v1-channelz-token"));
}
@VisibleForTesting
ChannelzService(Channelz channelz, int maxPageSize) {
ChannelzService(InternalChannelz channelz, int maxPageSize) {
this.channelz = channelz;
this.maxPageSize = maxPageSize;
}
@ -81,7 +81,7 @@ public final class ChannelzService extends ChannelzGrpc.ChannelzImplBase {
@Override
public void getTopChannels(
GetTopChannelsRequest request, StreamObserver<GetTopChannelsResponse> responseObserver) {
Channelz.RootChannelList rootChannels
InternalChannelz.RootChannelList rootChannels
= channelz.getRootChannels(request.getStartChannelId(), maxPageSize);
responseObserver.onNext(ChannelzProtoUtil.toGetTopChannelResponse(rootChannels));

59
services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java
View File

@ -17,7 +17,7 @@
package io.grpc.services;
import static com.google.common.truth.Truth.assertThat;
import static io.grpc.internal.Channelz.id;
import static io.grpc.InternalChannelz.id;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@ -32,6 +32,18 @@ import com.google.protobuf.Message;
import com.google.protobuf.util.Durations;
import com.google.protobuf.util.Timestamps;
import io.grpc.ConnectivityState;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.ChannelTrace.Event;
import io.grpc.InternalChannelz.ChannelTrace.Event.Severity;
import io.grpc.InternalChannelz.RootChannelList;
import io.grpc.InternalChannelz.ServerList;
import io.grpc.InternalChannelz.ServerSocketsList;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalChannelz.SocketOptions;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.WithLogId;
import io.grpc.channelz.v1.Address;
import io.grpc.channelz.v1.Address.OtherAddress;
import io.grpc.channelz.v1.Address.TcpIpAddress;
@ -62,18 +74,6 @@ import io.grpc.channelz.v1.SocketOptionTimeout;
import io.grpc.channelz.v1.SocketRef;
import io.grpc.channelz.v1.Subchannel;
import io.grpc.channelz.v1.SubchannelRef;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.ChannelTrace.Event;
import io.grpc.internal.Channelz.ChannelTrace.Event.Severity;
import io.grpc.internal.Channelz.RootChannelList;
import io.grpc.internal.Channelz.ServerList;
import io.grpc.internal.Channelz.ServerSocketsList;
import io.grpc.internal.Channelz.ServerStats;
import io.grpc.internal.Channelz.SocketOptions;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Instrumented;
import io.grpc.internal.WithLogId;
import io.grpc.services.ChannelzTestHelper.TestChannel;
import io.grpc.services.ChannelzTestHelper.TestListenSocket;
import io.grpc.services.ChannelzTestHelper.TestServer;
@ -188,8 +188,8 @@ public final class ChannelzProtoUtilTest {
.setValue("some-made-up-value")
.build();
private final Channelz.TcpInfo channelzTcpInfo
= new Channelz.TcpInfo.Builder()
private final InternalChannelz.TcpInfo channelzTcpInfo
= new InternalChannelz.TcpInfo.Builder()
.setState(70)
.setCaState(71)
.setRetransmits(72)
@ -440,8 +440,8 @@ public final class ChannelzProtoUtilTest {
when(local.getEncoded()).thenReturn("localcert".getBytes(Charsets.UTF_8));
when(remote.getEncoded()).thenReturn("remotecert".getBytes(Charsets.UTF_8));
socket.security = new Channelz.Security(
new Channelz.Tls("TLS_NULL_WITH_NULL_NULL", local, remote));
socket.security = new InternalChannelz.Security(
new InternalChannelz.Tls("TLS_NULL_WITH_NULL_NULL", local, remote));
assertEquals(
Security.newBuilder().setTls(
Tls.newBuilder()
@ -451,8 +451,8 @@ public final class ChannelzProtoUtilTest {
.build(),
ChannelzProtoUtil.toSocket(socket).getSecurity());
socket.security = new Channelz.Security(
new Channelz.Tls("TLS_NULL_WITH_NULL_NULL", /*localCert=*/ null, remote));
socket.security = new InternalChannelz.Security(
new InternalChannelz.Tls("TLS_NULL_WITH_NULL_NULL", /*localCert=*/ null, remote));
assertEquals(
Security.newBuilder().setTls(
Tls.newBuilder()
@ -461,8 +461,8 @@ public final class ChannelzProtoUtilTest {
.build(),
ChannelzProtoUtil.toSocket(socket).getSecurity());
socket.security = new Channelz.Security(
new Channelz.Tls("TLS_NULL_WITH_NULL_NULL", local, /*remoteCert=*/ null));
socket.security = new InternalChannelz.Security(
new InternalChannelz.Tls("TLS_NULL_WITH_NULL_NULL", local, /*remoteCert=*/ null));
assertEquals(
Security.newBuilder().setTls(
Tls.newBuilder()
@ -478,7 +478,8 @@ public final class ChannelzProtoUtilTest {
Message contents = GetChannelRequest.newBuilder().setChannelId(1).build();
Any packed = Any.pack(contents);
socket.security
= new Channelz.Security(new Channelz.OtherSecurity("other_security", packed));
= new InternalChannelz.Security(
new InternalChannelz.OtherSecurity("other_security", packed));
assertEquals(
Security.newBuilder().setOther(
OtherSecurity.newBuilder().setName("other_security").setValue(packed))
@ -808,22 +809,22 @@ public final class ChannelzProtoUtilTest {
public void toSocketOptionsList() {
assertThat(
ChannelzProtoUtil.toSocketOptionsList(
new Channelz.SocketOptions.Builder().build()))
new InternalChannelz.SocketOptions.Builder().build()))
.isEmpty();
assertThat(
ChannelzProtoUtil.toSocketOptionsList(
new Channelz.SocketOptions.Builder().setSocketOptionLingerSeconds(10).build()))
new InternalChannelz.SocketOptions.Builder().setSocketOptionLingerSeconds(10).build()))
.containsExactly(sockOptlinger10s);
assertThat(
ChannelzProtoUtil.toSocketOptionsList(
new Channelz.SocketOptions.Builder().setSocketOptionTimeoutMillis(200).build()))
new InternalChannelz.SocketOptions.Builder().setSocketOptionTimeoutMillis(200).build()))
.containsExactly(sockOptTimeout200ms);
assertThat(
ChannelzProtoUtil.toSocketOptionsList(
new Channelz.SocketOptions
new InternalChannelz.SocketOptions
.Builder()
.addOption("SO_MADE_UP_OPTION", "some-made-up-value")
.build()))
@ -836,7 +837,7 @@ public final class ChannelzProtoUtilTest {
.build();
assertThat(
ChannelzProtoUtil.toSocketOptionsList(
new Channelz.SocketOptions.Builder()
new InternalChannelz.SocketOptions.Builder()
.addOption("SO_MADE_UP_OPTION", "some-made-up-value")
.addOption("SO_MADE_UP_OPTION2", "some-made-up-value2")
.build()))
@ -846,7 +847,7 @@ public final class ChannelzProtoUtilTest {
@Test
public void channelTrace_withoutEvents() {
ChannelStats stats = toBuilder(channel.stats)
.setChannelTrace(new Channelz.ChannelTrace.Builder()
.setChannelTrace(new InternalChannelz.ChannelTrace.Builder()
.setNumEventsLogged(1234)
.setCreationTimeNanos(1000)
.build())
@ -874,7 +875,7 @@ public final class ChannelzProtoUtilTest {
ChannelStats stats =
toBuilder(channel.stats)
.setChannelTrace(
new Channelz.ChannelTrace.Builder()
new InternalChannelz.ChannelTrace.Builder()
.setNumEventsLogged(1234)
.setCreationTimeNanos(1000)
.setEvents(Arrays.asList(event1, event2))

4
services/src/test/java/io/grpc/services/ChannelzServiceTest.java
View File

@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import io.grpc.InternalChannelz;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.grpc.channelz.v1.GetChannelRequest;
@ -32,7 +33,6 @@ import io.grpc.channelz.v1.GetSubchannelRequest;
import io.grpc.channelz.v1.GetSubchannelResponse;
import io.grpc.channelz.v1.GetTopChannelsRequest;
import io.grpc.channelz.v1.GetTopChannelsResponse;
import io.grpc.internal.Channelz;
import io.grpc.services.ChannelzTestHelper.TestChannel;
import io.grpc.services.ChannelzTestHelper.TestServer;
import io.grpc.services.ChannelzTestHelper.TestSocket;
@ -48,7 +48,7 @@ public class ChannelzServiceTest {
// small value to force pagination
private static final int MAX_PAGE_SIZE = 1;
private final Channelz channelz = new Channelz();
private final InternalChannelz channelz = new InternalChannelz();
private ChannelzService service = new ChannelzService(channelz, MAX_PAGE_SIZE);
@Test

23
services/src/test/java/io/grpc/services/ChannelzTestHelper.java
View File

@ -20,16 +20,16 @@ import com.google.common.base.MoreObjects;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.SettableFuture;
import io.grpc.ConnectivityState;
import io.grpc.internal.Channelz;
import io.grpc.internal.Channelz.ChannelStats;
import io.grpc.internal.Channelz.Security;
import io.grpc.internal.Channelz.ServerStats;
import io.grpc.internal.Channelz.SocketOptions;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Channelz.TransportStats;
import io.grpc.internal.Instrumented;
import io.grpc.internal.LogId;
import io.grpc.internal.WithLogId;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz;
import io.grpc.InternalChannelz.ChannelStats;
import io.grpc.InternalChannelz.Security;
import io.grpc.InternalChannelz.ServerStats;
import io.grpc.InternalChannelz.SocketOptions;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalChannelz.TransportStats;
import io.grpc.LogId;
import io.grpc.WithLogId;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Collections;
@ -57,7 +57,8 @@ final class ChannelzTestHelper {
/*remoteFlowControlWindow=*/ 12);
SocketAddress local = new InetSocketAddress("10.0.0.1", 1000);
SocketAddress remote = new InetSocketAddress("10.0.0.2", 1000);
Channelz.SocketOptions socketOptions = new Channelz.SocketOptions.Builder().build();
InternalChannelz.SocketOptions socketOptions
= new InternalChannelz.SocketOptions.Builder().build();
Security security = null;
@Override

6
testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
View File

@ -48,17 +48,17 @@ import io.grpc.CallCredentials;
import io.grpc.CallOptions;
import io.grpc.ClientStreamTracer;
import io.grpc.Grpc;
import io.grpc.Instrumented;
import io.grpc.InternalChannelz.SocketStats;
import io.grpc.InternalChannelz.TransportStats;
import io.grpc.Metadata;
import io.grpc.MethodDescriptor;
import io.grpc.ServerStreamTracer;
import io.grpc.Status;
import io.grpc.internal.Channelz.SocketStats;
import io.grpc.internal.Channelz.TransportStats;
import io.grpc.internal.ClientStream;
import io.grpc.internal.ClientStreamListener;
import io.grpc.internal.ClientTransport;
import io.grpc.internal.ConnectionClientTransport;
import io.grpc.internal.Instrumented;
import io.grpc.internal.InternalServer;
import io.grpc.internal.IoUtils;
import io.grpc.internal.ManagedClientTransport;