core: move ChannelStats and TransportStats to io.grpc.internal.Channelz (#4008)

1 files changed, 29 insertions, 29 deletions

diff --git a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
index 744c5681d..05ec5f4ad 100644
--- a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
+++ b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
@@ -47,11 +47,11 @@ import io.grpc.Attributes;
 import io.grpc.CallOptions;
 import io.grpc.ClientStreamTracer;
 import io.grpc.Grpc;
-import io.grpc.InternalTransportStats;
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 import io.grpc.ServerStreamTracer;
 import io.grpc.Status;
+import io.grpc.internal.Channelz.TransportStats;
 import io.grpc.internal.ClientStream;
 import io.grpc.internal.ClientStreamListener;
 import io.grpc.internal.ClientTransport;
@@ -1406,10 +1406,10 @@ public abstract class AbstractTransportTest {
     long serverFirstTimestampNanos;
     long clientFirstTimestampNanos;
     {
-      InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
+      TransportStats serverBefore = serverTransportListener.transport.getStats().get();
       assertEquals(0, serverBefore.streamsStarted);
       assertEquals(0, serverBefore.lastStreamCreatedTimeNanos);
-      InternalTransportStats clientBefore = client.getStats().get();
+      TransportStats clientBefore = client.getStats().get();
       assertEquals(0, clientBefore.streamsStarted);
       assertEquals(0, clientBefore.lastStreamCreatedTimeNanos);
 
@@ -1419,14 +1419,14 @@ public abstract class AbstractTransportTest {
       StreamCreation serverStreamCreation = serverTransportListener
           .takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
-      InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
+      TransportStats serverAfter = serverTransportListener.transport.getStats().get();
       assertEquals(1, serverAfter.streamsStarted);
       serverFirstTimestampNanos = serverAfter.lastStreamCreatedTimeNanos;
       assertEquals(
           currentTimeMillis(),
           TimeUnit.NANOSECONDS.toMillis(serverAfter.lastStreamCreatedTimeNanos));
 
-      InternalTransportStats clientAfter = client.getStats().get();
+      TransportStats clientAfter = client.getStats().get();
       assertEquals(1, clientAfter.streamsStarted);
       clientFirstTimestampNanos = clientAfter.lastStreamCreatedTimeNanos;
       assertEquals(
@@ -1442,9 +1442,9 @@ public abstract class AbstractTransportTest {
 
     // start second stream
     {
-      InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
+      TransportStats serverBefore = serverTransportListener.transport.getStats().get();
       assertEquals(1, serverBefore.streamsStarted);
-      InternalTransportStats clientBefore = client.getStats().get();
+      TransportStats clientBefore = client.getStats().get();
       assertEquals(1, clientBefore.streamsStarted);
 
       ClientStream clientStream = client.newStream(methodDescriptor, new Metadata(), callOptions);
@@ -1453,7 +1453,7 @@ public abstract class AbstractTransportTest {
       StreamCreation serverStreamCreation = serverTransportListener
           .takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
-      InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
+      TransportStats serverAfter = serverTransportListener.transport.getStats().get();
       assertEquals(2, serverAfter.streamsStarted);
       assertEquals(
           TimeUnit.MILLISECONDS.toNanos(elapsedMillis),
@@ -1462,7 +1462,7 @@ public abstract class AbstractTransportTest {
           TimeUnit.NANOSECONDS.toMillis(serverAfter.lastStreamCreatedTimeNanos);
       assertEquals(currentTimeMillis(), serverSecondTimestamp);
 
-      InternalTransportStats clientAfter = client.getStats().get();
+      TransportStats clientAfter = client.getStats().get();
       assertEquals(2, clientAfter.streamsStarted);
       assertEquals(
           TimeUnit.MILLISECONDS.toNanos(elapsedMillis),
@@ -1493,10 +1493,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
+    TransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.streamsSucceeded);
     assertEquals(0, serverBefore.streamsFailed);
-    InternalTransportStats clientBefore = client.getStats().get();
+    TransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.streamsSucceeded);
     assertEquals(0, clientBefore.streamsFailed);
 
@@ -1507,10 +1507,10 @@ public abstract class AbstractTransportTest {
     assertNotNull(clientStreamListener.trailers.get(TIMEOUT_MS, TimeUnit.MILLISECONDS));
 
 
-    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
+    TransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.streamsSucceeded);
     assertEquals(0, serverAfter.streamsFailed);
-    InternalTransportStats clientAfter = client.getStats().get();
+    TransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.streamsSucceeded);
     assertEquals(0, clientAfter.streamsFailed);
   }
@@ -1532,10 +1532,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
+    TransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.streamsFailed);
     assertEquals(0, serverBefore.streamsSucceeded);
-    InternalTransportStats clientBefore = client.getStats().get();
+    TransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.streamsFailed);
     assertEquals(0, clientBefore.streamsSucceeded);
 
@@ -1545,10 +1545,10 @@ public abstract class AbstractTransportTest {
     assertNotNull(clientStreamListener.trailers.get(TIMEOUT_MS, TimeUnit.MILLISECONDS));
 
 
-    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
+    TransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.streamsFailed);
     assertEquals(0, serverAfter.streamsSucceeded);
-    InternalTransportStats clientAfter = client.getStats().get();
+    TransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.streamsFailed);
     assertEquals(0, clientAfter.streamsSucceeded);
 
@@ -1571,10 +1571,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
+    TransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.streamsFailed);
     assertEquals(0, serverBefore.streamsSucceeded);
-    InternalTransportStats clientBefore = client.getStats().get();
+    TransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.streamsFailed);
     assertEquals(0, clientBefore.streamsSucceeded);
 
@@ -1582,10 +1582,10 @@ public abstract class AbstractTransportTest {
     // do not validate stats until close() has been called on server
     assertNotNull(serverStreamCreation.listener.status.get(TIMEOUT_MS, TimeUnit.MILLISECONDS));
 
-    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
+    TransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.streamsFailed);
     assertEquals(0, serverAfter.streamsSucceeded);
-    InternalTransportStats clientAfter = client.getStats().get();
+    TransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.streamsFailed);
     assertEquals(0, clientAfter.streamsSucceeded);
   }
@@ -1608,10 +1608,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
+    TransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.messagesReceived);
     assertEquals(0, serverBefore.lastMessageReceivedTimeNanos);
-    InternalTransportStats clientBefore = client.getStats().get();
+    TransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.messagesSent);
     assertEquals(0, clientBefore.lastMessageSentTimeNanos);
 
@@ -1621,12 +1621,12 @@ public abstract class AbstractTransportTest {
     clientStream.halfClose();
     verifyMessageCountAndClose(serverStreamListener.messageQueue, 1);
 
-    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
+    TransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.messagesReceived);
     long serverTimestamp =
         TimeUnit.NANOSECONDS.toMillis(serverAfter.lastMessageReceivedTimeNanos);
     assertEquals(currentTimeMillis(), serverTimestamp);
-    InternalTransportStats clientAfter = client.getStats().get();
+    TransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.messagesSent);
     long clientTimestamp =
         TimeUnit.NANOSECONDS.toMillis(clientAfter.lastMessageSentTimeNanos);
@@ -1652,10 +1652,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
+    TransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.messagesSent);
     assertEquals(0, serverBefore.lastMessageSentTimeNanos);
-    InternalTransportStats clientBefore = client.getStats().get();
+    TransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.messagesReceived);
     assertEquals(0, clientBefore.lastMessageReceivedTimeNanos);
 
@@ -1665,11 +1665,11 @@ public abstract class AbstractTransportTest {
     serverStream.flush();
     verifyMessageCountAndClose(clientStreamListener.messageQueue, 1);
 
-    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
+    TransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.messagesSent);
     long serverTimestmap = TimeUnit.NANOSECONDS.toMillis(serverAfter.lastMessageSentTimeNanos);
     assertEquals(currentTimeMillis(), serverTimestmap);
-    InternalTransportStats clientAfter = client.getStats().get();
+    TransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.messagesReceived);
     long clientTimestmap =
         TimeUnit.NANOSECONDS.toMillis(clientAfter.lastMessageReceivedTimeNanos);