core: InternalInstrumented<T> for instrumented classes (#3817)

Entities that report stats to channelz will implement this interface.

1 files changed, 28 insertions, 42 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 ed32002c3..be636033e 100644
--- a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
+++ b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java
@@ -1406,11 +1406,10 @@ public abstract class AbstractTransportTest {
     long serverFirstTimestampNanos;
     long clientFirstTimestampNanos;
     {
-      InternalTransportStats serverBefore =
-          serverTransportListener.transport.getTransportStats().get();
+      InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
       assertEquals(0, serverBefore.streamsStarted);
       assertEquals(0, serverBefore.lastStreamCreatedTimeNanos);
-      InternalTransportStats clientBefore = client.getTransportStats().get();
+      InternalTransportStats clientBefore = client.getStats().get();
       assertEquals(0, clientBefore.streamsStarted);
       assertEquals(0, clientBefore.lastStreamCreatedTimeNanos);
 
@@ -1420,15 +1419,14 @@ public abstract class AbstractTransportTest {
       StreamCreation serverStreamCreation = serverTransportListener
           .takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
-      InternalTransportStats serverAfter =
-          serverTransportListener.transport.getTransportStats().get();
+      InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
       assertEquals(1, serverAfter.streamsStarted);
       serverFirstTimestampNanos = serverAfter.lastStreamCreatedTimeNanos;
       assertEquals(
           currentTimeMillis(),
           TimeUnit.NANOSECONDS.toMillis(serverAfter.lastStreamCreatedTimeNanos));
 
-      InternalTransportStats clientAfter = client.getTransportStats().get();
+      InternalTransportStats clientAfter = client.getStats().get();
       assertEquals(1, clientAfter.streamsStarted);
       clientFirstTimestampNanos = clientAfter.lastStreamCreatedTimeNanos;
       assertEquals(
@@ -1444,10 +1442,9 @@ public abstract class AbstractTransportTest {
 
     // start second stream
     {
-      InternalTransportStats serverBefore =
-          serverTransportListener.transport.getTransportStats().get();
+      InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
       assertEquals(1, serverBefore.streamsStarted);
-      InternalTransportStats clientBefore = client.getTransportStats().get();
+      InternalTransportStats clientBefore = client.getStats().get();
       assertEquals(1, clientBefore.streamsStarted);
 
       ClientStream clientStream = client.newStream(methodDescriptor, new Metadata(), callOptions);
@@ -1456,8 +1453,7 @@ public abstract class AbstractTransportTest {
       StreamCreation serverStreamCreation = serverTransportListener
           .takeStreamOrFail(TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
-      InternalTransportStats serverAfter =
-          serverTransportListener.transport.getTransportStats().get();
+      InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
       assertEquals(2, serverAfter.streamsStarted);
       assertEquals(
           TimeUnit.MILLISECONDS.toNanos(elapsedMillis),
@@ -1466,7 +1462,7 @@ public abstract class AbstractTransportTest {
           TimeUnit.NANOSECONDS.toMillis(serverAfter.lastStreamCreatedTimeNanos);
       assertEquals(currentTimeMillis(), serverSecondTimestamp);
 
-      InternalTransportStats clientAfter = client.getTransportStats().get();
+      InternalTransportStats clientAfter = client.getStats().get();
       assertEquals(2, clientAfter.streamsStarted);
       assertEquals(
           TimeUnit.MILLISECONDS.toNanos(elapsedMillis),
@@ -1497,11 +1493,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.streamsSucceeded);
     assertEquals(0, serverBefore.streamsFailed);
-    InternalTransportStats clientBefore = client.getTransportStats().get();
+    InternalTransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.streamsSucceeded);
     assertEquals(0, clientBefore.streamsFailed);
 
@@ -1512,11 +1507,10 @@ public abstract class AbstractTransportTest {
     assertNotNull(clientStreamListener.trailers.get(TIMEOUT_MS, TimeUnit.MILLISECONDS));
 
 
-    InternalTransportStats serverAfter =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.streamsSucceeded);
     assertEquals(0, serverAfter.streamsFailed);
-    InternalTransportStats clientAfter = client.getTransportStats().get();
+    InternalTransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.streamsSucceeded);
     assertEquals(0, clientAfter.streamsFailed);
   }
@@ -1538,11 +1532,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.streamsFailed);
     assertEquals(0, serverBefore.streamsSucceeded);
-    InternalTransportStats clientBefore = client.getTransportStats().get();
+    InternalTransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.streamsFailed);
     assertEquals(0, clientBefore.streamsSucceeded);
 
@@ -1552,11 +1545,10 @@ public abstract class AbstractTransportTest {
     assertNotNull(clientStreamListener.trailers.get(TIMEOUT_MS, TimeUnit.MILLISECONDS));
 
 
-    InternalTransportStats serverAfter =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.streamsFailed);
     assertEquals(0, serverAfter.streamsSucceeded);
-    InternalTransportStats clientAfter = client.getTransportStats().get();
+    InternalTransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.streamsFailed);
     assertEquals(0, clientAfter.streamsSucceeded);
 
@@ -1579,11 +1571,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.streamsFailed);
     assertEquals(0, serverBefore.streamsSucceeded);
-    InternalTransportStats clientBefore = client.getTransportStats().get();
+    InternalTransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.streamsFailed);
     assertEquals(0, clientBefore.streamsSucceeded);
 
@@ -1591,11 +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.getTransportStats().get();
+    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.streamsFailed);
     assertEquals(0, serverAfter.streamsSucceeded);
-    InternalTransportStats clientAfter = client.getTransportStats().get();
+    InternalTransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.streamsFailed);
     assertEquals(0, clientAfter.streamsSucceeded);
   }
@@ -1618,11 +1608,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.messagesReceived);
     assertEquals(0, serverBefore.lastMessageReceivedTimeNanos);
-    InternalTransportStats clientBefore = client.getTransportStats().get();
+    InternalTransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.messagesSent);
     assertEquals(0, clientBefore.lastMessageSentTimeNanos);
 
@@ -1632,13 +1621,12 @@ public abstract class AbstractTransportTest {
     clientStream.halfClose();
     verifyMessageCountAndClose(serverStreamListener.messageQueue, 1);
 
-    InternalTransportStats serverAfter =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.messagesReceived);
     long serverTimestamp =
         TimeUnit.NANOSECONDS.toMillis(serverAfter.lastMessageReceivedTimeNanos);
     assertEquals(currentTimeMillis(), serverTimestamp);
-    InternalTransportStats clientAfter = client.getTransportStats().get();
+    InternalTransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.messagesSent);
     long clientTimestamp =
         TimeUnit.NANOSECONDS.toMillis(clientAfter.lastMessageSentTimeNanos);
@@ -1664,11 +1652,10 @@ public abstract class AbstractTransportTest {
       return;
     }
 
-    InternalTransportStats serverBefore =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverBefore = serverTransportListener.transport.getStats().get();
     assertEquals(0, serverBefore.messagesSent);
     assertEquals(0, serverBefore.lastMessageSentTimeNanos);
-    InternalTransportStats clientBefore = client.getTransportStats().get();
+    InternalTransportStats clientBefore = client.getStats().get();
     assertEquals(0, clientBefore.messagesReceived);
     assertEquals(0, clientBefore.lastMessageReceivedTimeNanos);
 
@@ -1678,12 +1665,11 @@ public abstract class AbstractTransportTest {
     serverStream.flush();
     verifyMessageCountAndClose(clientStreamListener.messageQueue, 1);
 
-    InternalTransportStats serverAfter =
-        serverTransportListener.transport.getTransportStats().get();
+    InternalTransportStats serverAfter = serverTransportListener.transport.getStats().get();
     assertEquals(1, serverAfter.messagesSent);
     long serverTimestmap = TimeUnit.NANOSECONDS.toMillis(serverAfter.lastMessageSentTimeNanos);
     assertEquals(currentTimeMillis(), serverTimestmap);
-    InternalTransportStats clientAfter = client.getTransportStats().get();
+    InternalTransportStats clientAfter = client.getStats().get();
     assertEquals(1, clientAfter.messagesReceived);
     long clientTimestmap =
         TimeUnit.NANOSECONDS.toMillis(clientAfter.lastMessageReceivedTimeNanos);