diff --git a/core/src/main/java/io/grpc/internal/LogId.java b/core/src/main/java/io/grpc/InternalLogId.java similarity index 79% rename from core/src/main/java/io/grpc/internal/LogId.java rename to core/src/main/java/io/grpc/InternalLogId.java index cafe8e33a3..7196b2cd44 100644 --- a/core/src/main/java/io/grpc/internal/LogId.java +++ b/core/src/main/java/io/grpc/InternalLogId.java @@ -14,28 +14,31 @@ * limitations under the License. */ -package io.grpc.internal; +package io.grpc; import java.util.concurrent.atomic.AtomicLong; /** - * A loggable ID, unique for the duration of the program. + * Do not use this. + * + *

A loggable ID, unique for the duration of the program. */ -public final class LogId { +@Internal +public final class InternalLogId { private static final AtomicLong idAlloc = new AtomicLong(); /** * @param tag a loggable tag associated with this tag. The ID that is allocated is guaranteed * to be unique and increasing, irrespective of the tag. */ - public static LogId allocate(String tag) { - return new LogId(tag, idAlloc.incrementAndGet()); + public static InternalLogId allocate(String tag) { + return new InternalLogId(tag, idAlloc.incrementAndGet()); } private final String tag; private final long id; - private LogId(String tag, long id) { + private InternalLogId(String tag, long id) { this.tag = tag; this.id = id; } diff --git a/core/src/main/java/io/grpc/internal/WithLogId.java b/core/src/main/java/io/grpc/InternalWithLogId.java similarity index 81% rename from core/src/main/java/io/grpc/internal/WithLogId.java rename to core/src/main/java/io/grpc/InternalWithLogId.java index b209e6d4ca..486d37a881 100644 --- a/core/src/main/java/io/grpc/internal/WithLogId.java +++ b/core/src/main/java/io/grpc/InternalWithLogId.java @@ -14,12 +14,15 @@ * limitations under the License. */ -package io.grpc.internal; +package io.grpc; /** - * An object that has an ID that is unique within the JVM, primarily for debug logging. + * Do not use this. + * + *

An object that has an ID that is unique within the JVM, primarily for debug logging. */ -public interface WithLogId { +@Internal +public interface InternalWithLogId { /** * Returns an ID that is primarily used in debug logs. It usually contains the class name and a * numeric ID that is unique among the instances. @@ -27,5 +30,5 @@ public interface WithLogId { *

The subclasses of this interface usually want to include the log ID in their {@link * #toString} results. */ - LogId getLogId(); + InternalLogId getLogId(); } diff --git a/core/src/main/java/io/grpc/inprocess/InProcessTransport.java b/core/src/main/java/io/grpc/inprocess/InProcessTransport.java index aa7372ebe1..ef80a8a6a8 100644 --- a/core/src/main/java/io/grpc/inprocess/InProcessTransport.java +++ b/core/src/main/java/io/grpc/inprocess/InProcessTransport.java @@ -25,6 +25,7 @@ import io.grpc.Compressor; import io.grpc.Decompressor; import io.grpc.DecompressorRegistry; import io.grpc.Grpc; +import io.grpc.InternalLogId; import io.grpc.InternalTransportStats; import io.grpc.Metadata; import io.grpc.MethodDescriptor; @@ -33,7 +34,6 @@ import io.grpc.Status; import io.grpc.internal.ClientStream; import io.grpc.internal.ClientStreamListener; import io.grpc.internal.ConnectionClientTransport; -import io.grpc.internal.LogId; import io.grpc.internal.ManagedClientTransport; import io.grpc.internal.NoopClientStream; import io.grpc.internal.ObjectPool; @@ -63,7 +63,7 @@ import javax.annotation.concurrent.ThreadSafe; final class InProcessTransport implements ServerTransport, ConnectionClientTransport { private static final Logger log = Logger.getLogger(InProcessTransport.class.getName()); - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final String name; private final String authority; private ObjectPool serverSchedulerPool; @@ -206,7 +206,7 @@ final class InProcessTransport implements ServerTransport, ConnectionClientTrans } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/core/src/main/java/io/grpc/internal/DelayedClientTransport.java b/core/src/main/java/io/grpc/internal/DelayedClientTransport.java index 29a2de907a..819966b72a 100644 --- a/core/src/main/java/io/grpc/internal/DelayedClientTransport.java +++ b/core/src/main/java/io/grpc/internal/DelayedClientTransport.java @@ -20,6 +20,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.util.concurrent.SettableFuture; import io.grpc.CallOptions; import io.grpc.Context; +import io.grpc.InternalLogId; import io.grpc.InternalTransportStats; import io.grpc.LoadBalancer.PickResult; import io.grpc.LoadBalancer.PickSubchannelArgs; @@ -48,7 +49,7 @@ import javax.annotation.concurrent.GuardedBy; * thus the delayed transport stops owning the stream. */ final class DelayedClientTransport implements ManagedClientTransport { - private final LogId lodId = LogId.allocate(getClass().getName()); + private final InternalLogId lodId = InternalLogId.allocate(getClass().getName()); private final Object lock = new Object(); @@ -389,7 +390,7 @@ final class DelayedClientTransport implements ManagedClientTransport { // TODO(carl-mastrangelo): remove this once the Subchannel change is in. @Override - public LogId getLogId() { + public InternalLogId getLogId() { return lodId; } diff --git a/core/src/main/java/io/grpc/internal/ForwardingConnectionClientTransport.java b/core/src/main/java/io/grpc/internal/ForwardingConnectionClientTransport.java index 6594fb77b6..8a3bbb066d 100644 --- a/core/src/main/java/io/grpc/internal/ForwardingConnectionClientTransport.java +++ b/core/src/main/java/io/grpc/internal/ForwardingConnectionClientTransport.java @@ -19,6 +19,7 @@ package io.grpc.internal; import com.google.common.util.concurrent.SettableFuture; import io.grpc.Attributes; import io.grpc.CallOptions; +import io.grpc.InternalLogId; import io.grpc.InternalTransportStats; import io.grpc.Metadata; import io.grpc.MethodDescriptor; @@ -54,7 +55,7 @@ abstract class ForwardingConnectionClientTransport implements ConnectionClientTr } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return delegate().getLogId(); } diff --git a/core/src/main/java/io/grpc/internal/InternalSubchannel.java b/core/src/main/java/io/grpc/internal/InternalSubchannel.java index 6f402ca84d..959e887e52 100644 --- a/core/src/main/java/io/grpc/internal/InternalSubchannel.java +++ b/core/src/main/java/io/grpc/internal/InternalSubchannel.java @@ -30,6 +30,8 @@ import com.google.errorprone.annotations.ForOverride; import io.grpc.ConnectivityState; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; +import io.grpc.InternalLogId; +import io.grpc.InternalWithLogId; import io.grpc.Status; import java.net.SocketAddress; import java.util.ArrayList; @@ -48,10 +50,10 @@ import javax.annotation.concurrent.ThreadSafe; * Transports for a single {@link SocketAddress}. */ @ThreadSafe -final class InternalSubchannel implements WithLogId { +final class InternalSubchannel implements InternalWithLogId { private static final Logger log = Logger.getLogger(InternalSubchannel.class.getName()); - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final String authority; private final String userAgent; private final BackoffPolicy.Provider backoffPolicyProvider; @@ -432,7 +434,7 @@ final class InternalSubchannel implements WithLogId { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java index 1de240265a..ddec4b848d 100644 --- a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java +++ b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java @@ -38,6 +38,8 @@ import io.grpc.ConnectivityStateInfo; import io.grpc.Context; import io.grpc.DecompressorRegistry; import io.grpc.EquivalentAddressGroup; +import io.grpc.InternalLogId; +import io.grpc.InternalWithLogId; import io.grpc.LoadBalancer; import io.grpc.LoadBalancer.PickResult; import io.grpc.LoadBalancer.PickSubchannelArgs; @@ -74,7 +76,7 @@ import javax.annotation.concurrent.ThreadSafe; /** A communication channel for making outgoing RPCs. */ @ThreadSafe -public final class ManagedChannelImpl extends ManagedChannel implements WithLogId { +public final class ManagedChannelImpl extends ManagedChannel implements InternalWithLogId { static final Logger logger = Logger.getLogger(ManagedChannelImpl.class.getName()); // Matching this pattern means the target string is a URI target or at least intended to be one. @@ -108,7 +110,7 @@ public final class ManagedChannelImpl extends ManagedChannel implements WithLogI private final Executor executor; private final ObjectPool executorPool; private final ObjectPool oobExecutorPool; - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final ChannelExecutor channelExecutor = new ChannelExecutor(); @@ -869,7 +871,7 @@ public final class ManagedChannelImpl extends ManagedChannel implements WithLogI } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } @@ -1026,7 +1028,7 @@ public final class ManagedChannelImpl extends ManagedChannel implements WithLogI Boolean.parseBoolean(System.getProperty(ALLOCATION_SITE_PROPERTY_NAME, "true")); private static final RuntimeException missingCallSite = missingCallSite(); - private final LogId logId; + private final InternalLogId logId; private final String target; private final Reference allocationSite; private volatile boolean shutdown; diff --git a/core/src/main/java/io/grpc/internal/ManagedClientTransport.java b/core/src/main/java/io/grpc/internal/ManagedClientTransport.java index 30f7f7103a..e50cd7902a 100644 --- a/core/src/main/java/io/grpc/internal/ManagedClientTransport.java +++ b/core/src/main/java/io/grpc/internal/ManagedClientTransport.java @@ -16,6 +16,7 @@ package io.grpc.internal; +import io.grpc.InternalWithLogId; import io.grpc.Status; import javax.annotation.CheckReturnValue; import javax.annotation.Nullable; @@ -33,7 +34,7 @@ import javax.annotation.concurrent.ThreadSafe; * {@link Listener#transportTerminated}. */ @ThreadSafe -public interface ManagedClientTransport extends ClientTransport, WithLogId { +public interface ManagedClientTransport extends ClientTransport, InternalWithLogId { /** * Starts transport. This method may only be called once. diff --git a/core/src/main/java/io/grpc/internal/OobChannel.java b/core/src/main/java/io/grpc/internal/OobChannel.java index 3a35e44015..d3efa32cb0 100644 --- a/core/src/main/java/io/grpc/internal/OobChannel.java +++ b/core/src/main/java/io/grpc/internal/OobChannel.java @@ -25,6 +25,8 @@ import io.grpc.ClientCall; import io.grpc.ConnectivityStateInfo; import io.grpc.Context; import io.grpc.EquivalentAddressGroup; +import io.grpc.InternalLogId; +import io.grpc.InternalWithLogId; import io.grpc.LoadBalancer.Subchannel; import io.grpc.LoadBalancer; import io.grpc.LoadBalancer.PickResult; @@ -48,14 +50,14 @@ import javax.annotation.concurrent.ThreadSafe; * to its own RPC needs. */ @ThreadSafe -final class OobChannel extends ManagedChannel implements WithLogId { +final class OobChannel extends ManagedChannel implements InternalWithLogId { private static final Logger log = Logger.getLogger(OobChannel.class.getName()); private InternalSubchannel subchannel; private AbstractSubchannel subchannelImpl; private SubchannelPicker subchannelPicker; - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final String authority; private final DelayedClientTransport delayedTransport; private final ObjectPool executorPool; @@ -172,7 +174,7 @@ final class OobChannel extends ManagedChannel implements WithLogId { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/core/src/main/java/io/grpc/internal/ServerImpl.java b/core/src/main/java/io/grpc/internal/ServerImpl.java index c9932d293d..df6d592387 100644 --- a/core/src/main/java/io/grpc/internal/ServerImpl.java +++ b/core/src/main/java/io/grpc/internal/ServerImpl.java @@ -32,7 +32,9 @@ import io.grpc.Context; import io.grpc.Decompressor; import io.grpc.DecompressorRegistry; import io.grpc.HandlerRegistry; +import io.grpc.InternalLogId; import io.grpc.InternalServerInterceptors; +import io.grpc.InternalWithLogId; import io.grpc.Metadata; import io.grpc.ServerCall; import io.grpc.ServerCallHandler; @@ -70,11 +72,11 @@ import javax.annotation.concurrent.GuardedBy; *

Starting the server starts the underlying transport for servicing requests. Stopping the * server stops servicing new requests and waits for all connections to terminate. */ -public final class ServerImpl extends io.grpc.Server implements WithLogId { +public final class ServerImpl extends io.grpc.Server implements InternalWithLogId { private static final Logger log = Logger.getLogger(ServerImpl.class.getName()); private static final ServerStreamListener NOOP_LISTENER = new NoopListener(); - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final ObjectPool executorPool; /** Executor for application processing. Safe to read after {@link #start()}. */ private Executor executor; @@ -527,7 +529,7 @@ public final class ServerImpl extends io.grpc.Server implements WithLogId { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/core/src/main/java/io/grpc/internal/ServerTransport.java b/core/src/main/java/io/grpc/internal/ServerTransport.java index 493a960819..1826228d0c 100644 --- a/core/src/main/java/io/grpc/internal/ServerTransport.java +++ b/core/src/main/java/io/grpc/internal/ServerTransport.java @@ -17,12 +17,13 @@ package io.grpc.internal; import io.grpc.InternalTransportStats; +import io.grpc.InternalWithLogId; import io.grpc.Status; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; /** An inbound connection. */ -public interface ServerTransport extends WithLogId { +public interface ServerTransport extends InternalWithLogId { /** * Initiates an orderly shutdown of the transport. Existing streams continue, but new streams will * eventually begin failing. New streams "eventually" begin failing because shutdown may need to diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java index 3d989125f8..1b348fceb9 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplTest.java @@ -60,6 +60,7 @@ import io.grpc.ConnectivityStateInfo; import io.grpc.Context; import io.grpc.EquivalentAddressGroup; import io.grpc.IntegerMarshaller; +import io.grpc.InternalLogId; import io.grpc.LoadBalancer; import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.PickResult; @@ -1596,7 +1597,7 @@ public class ManagedChannelImplTest { false, // Don't create a transport, Helper maintains a ref to the channel. ManagedChannelImpl.IDLE_TIMEOUT_MILLIS_DISABLE); assertNotNull(channel); - LogId logId = channel.getLogId(); + InternalLogId logId = channel.getLogId(); // Try to capture the log output but without causing terminal noise. Adding the filter must // be done before clearing the ref or else it might be missed. diff --git a/core/src/test/java/io/grpc/internal/ServerImplTest.java b/core/src/test/java/io/grpc/internal/ServerImplTest.java index b20dc358ed..30f3b411a1 100644 --- a/core/src/test/java/io/grpc/internal/ServerImplTest.java +++ b/core/src/test/java/io/grpc/internal/ServerImplTest.java @@ -50,6 +50,7 @@ import io.grpc.Context; import io.grpc.Grpc; import io.grpc.HandlerRegistry; import io.grpc.IntegerMarshaller; +import io.grpc.InternalLogId; import io.grpc.InternalTransportStats; import io.grpc.Metadata; import io.grpc.MethodDescriptor; @@ -1264,7 +1265,7 @@ public class ServerImplTest { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { throw new UnsupportedOperationException(); } diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java index 3b6b1eeeea..ec7326eecb 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer.java @@ -22,12 +22,12 @@ import com.google.common.annotations.VisibleForTesting; import io.grpc.Attributes; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; +import io.grpc.InternalLogId; +import io.grpc.InternalWithLogId; import io.grpc.LoadBalancer; import io.grpc.Status; import io.grpc.grpclb.GrpclbConstants.LbPolicy; -import io.grpc.internal.LogId; import io.grpc.internal.ObjectPool; -import io.grpc.internal.WithLogId; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -42,10 +42,10 @@ import javax.annotation.Nullable; *

Optionally, when requested by the naming system, will delegate the work to a local pick-first * or round-robin balancer. */ -class GrpclbLoadBalancer extends LoadBalancer implements WithLogId { +class GrpclbLoadBalancer extends LoadBalancer implements InternalWithLogId { private static final Logger logger = Logger.getLogger(GrpclbLoadBalancer.class.getName()); - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final Helper helper; private final Factory pickFirstBalancerFactory; @@ -81,7 +81,7 @@ class GrpclbLoadBalancer extends LoadBalancer implements WithLogId { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java index a82d29c177..56e451a06f 100644 --- a/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java +++ b/grpclb/src/main/java/io/grpc/grpclb/GrpclbState.java @@ -33,6 +33,7 @@ import io.grpc.Attributes; import io.grpc.ConnectivityState; import io.grpc.ConnectivityStateInfo; import io.grpc.EquivalentAddressGroup; +import io.grpc.InternalLogId; import io.grpc.LoadBalancer.Helper; import io.grpc.LoadBalancer.PickResult; import io.grpc.LoadBalancer.PickSubchannelArgs; @@ -42,7 +43,6 @@ import io.grpc.ManagedChannel; import io.grpc.Metadata; import io.grpc.Status; import io.grpc.grpclb.LoadBalanceResponse.LoadBalanceResponseTypeCase; -import io.grpc.internal.LogId; import io.grpc.stub.StreamObserver; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -53,8 +53,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; -import java.util.Map.Entry; import java.util.Map; +import java.util.Map.Entry; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -92,7 +92,7 @@ final class GrpclbState { } }; - private final LogId logId; + private final InternalLogId logId; private final String serviceName; private final Helper helper; private final TimeProvider time; @@ -127,7 +127,10 @@ final class GrpclbState { new RoundRobinPicker(Collections.emptyList(), Arrays.asList(BUFFER_ENTRY)); GrpclbState( - Helper helper, TimeProvider time, ScheduledExecutorService timerService, LogId logId) { + Helper helper, + TimeProvider time, + ScheduledExecutorService timerService, + InternalLogId logId) { this.helper = checkNotNull(helper, "helper"); this.time = checkNotNull(time, "time provider"); this.timerService = checkNotNull(timerService, "timerService"); diff --git a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java index 6bd75861b2..a5ae55064a 100644 --- a/netty/src/main/java/io/grpc/netty/NettyClientTransport.java +++ b/netty/src/main/java/io/grpc/netty/NettyClientTransport.java @@ -24,6 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.SettableFuture; import io.grpc.Attributes; import io.grpc.CallOptions; +import io.grpc.InternalLogId; import io.grpc.InternalTransportStats; import io.grpc.Metadata; import io.grpc.MethodDescriptor; @@ -35,7 +36,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; @@ -60,7 +60,7 @@ import javax.annotation.Nullable; * A Netty-based {@link ConnectionClientTransport} implementation. */ class NettyClientTransport implements ConnectionClientTransport { - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final Map, ?> channelOptions; private final SocketAddress address; private final Class channelType; @@ -299,7 +299,7 @@ class NettyClientTransport implements ConnectionClientTransport { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/netty/src/main/java/io/grpc/netty/NettyServer.java b/netty/src/main/java/io/grpc/netty/NettyServer.java index d09fffb619..c9ea596127 100644 --- a/netty/src/main/java/io/grpc/netty/NettyServer.java +++ b/netty/src/main/java/io/grpc/netty/NettyServer.java @@ -21,14 +21,14 @@ import static io.grpc.netty.NettyServerBuilder.MAX_CONNECTION_AGE_NANOS_DISABLED import static io.netty.channel.ChannelOption.SO_BACKLOG; import static io.netty.channel.ChannelOption.SO_KEEPALIVE; +import io.grpc.InternalLogId; +import io.grpc.InternalWithLogId; import io.grpc.ServerStreamTracer; 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; @@ -53,10 +53,10 @@ import javax.annotation.Nullable; /** * Netty-based server implementation. */ -class NettyServer implements InternalServer, WithLogId { +class NettyServer implements InternalServer, InternalWithLogId { private static final Logger log = Logger.getLogger(InternalServer.class.getName()); - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final SocketAddress address; private final Class channelType; private final Map, ?> channelOptions; @@ -238,7 +238,7 @@ class NettyServer implements InternalServer, WithLogId { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/netty/src/main/java/io/grpc/netty/NettyServerTransport.java b/netty/src/main/java/io/grpc/netty/NettyServerTransport.java index 633f051434..1ddc6bebc5 100644 --- a/netty/src/main/java/io/grpc/netty/NettyServerTransport.java +++ b/netty/src/main/java/io/grpc/netty/NettyServerTransport.java @@ -20,10 +20,10 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.SettableFuture; +import io.grpc.InternalLogId; import io.grpc.InternalTransportStats; import io.grpc.ServerStreamTracer; import io.grpc.Status; -import io.grpc.internal.LogId; import io.grpc.internal.ServerTransport; import io.grpc.internal.ServerTransportListener; import io.grpc.internal.TransportTracer; @@ -53,7 +53,7 @@ class NettyServerTransport implements ServerTransport { "Connection reset by peer", "An existing connection was forcibly closed by the remote host"); - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); private final Channel channel; private final ProtocolNegotiator protocolNegotiator; private final int maxStreams; @@ -139,7 +139,7 @@ class NettyServerTransport implements ServerTransport { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; } diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java index 57b579ed95..209c235aa9 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java @@ -30,6 +30,7 @@ import com.squareup.okhttp.Request; import com.squareup.okhttp.internal.http.StatusLine; import io.grpc.Attributes; import io.grpc.CallOptions; +import io.grpc.InternalLogId; import io.grpc.InternalTransportStats; import io.grpc.Metadata; import io.grpc.MethodDescriptor; @@ -42,7 +43,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.SerializingExecutor; import io.grpc.internal.SharedResourceHolder; import io.grpc.internal.StatsTraceContext; @@ -133,7 +133,7 @@ class OkHttpClientTransport implements ConnectionClientTransport { private AsyncFrameWriter frameWriter; private OutboundFlowController outboundFlow; private final Object lock = new Object(); - private final LogId logId = LogId.allocate(getClass().getName()); + private final InternalLogId logId = InternalLogId.allocate(getClass().getName()); @GuardedBy("lock") private int nextStreamId; @GuardedBy("lock") @@ -568,7 +568,7 @@ class OkHttpClientTransport implements ConnectionClientTransport { } @Override - public LogId getLogId() { + public InternalLogId getLogId() { return logId; }