Merge pull request #19 from sebright/rpc-metrics

Adds additional measures for RPC client and server stats.

Author: dinooliva

core/java/com/google/census/RpcConstants.java

@@ -27,14 +27,29 @@ public final class RpcConstants {
   /**
    * Census defined metric names.
    */
-  public static final MetricName RPC_CLIENT_BYTES_RECEIVED =
-      new MetricName("/rpc/client/bytes_received");
-  public static final MetricName RPC_CLIENT_BYTES_SENT = new MetricName("/rpc/client/bytes_sent");
-  public static final MetricName RPC_CLIENT_LATENCY = new MetricName("/rpc/client/latency");
-  public static final MetricName RPC_SERVER_BYTES_RECEIVED =
-      new MetricName("/rpc/server/bytes_received");
-  public static final MetricName RPC_SERVER_BYTES_SENT = new MetricName("/rpc/server/bytes_sent");
-  public static final MetricName RPC_SERVER_LATENCY = new MetricName("/rpc/server/latency");
+  public static final MetricName RPC_CLIENT_ERROR_COUNT = new MetricName("/rpc/client/error_count");
+  public static final MetricName RPC_CLIENT_REQUEST_BYTES =
+      new MetricName("/rpc/client/request_bytes");
+  public static final MetricName RPC_CLIENT_RESPONSE_BYTES =
+      new MetricName("/rpc/client/response_bytes");
+  public static final MetricName RPC_CLIENT_ROUNDTRIP_LATENCY =
+      new MetricName("/rpc/client/roundtrip_latency");
+  public static final MetricName RPC_CLIENT_UNCOMPRESSED_REQUEST_BYTES =
+      new MetricName("/rpc/client/uncompressed_request_bytes");
+  public static final MetricName RPC_CLIENT_UNCOMPRESSED_RESPONSE_BYTES =
+      new MetricName("/rpc/client/uncompressed_response_bytes");
+
+  public static final MetricName RPC_SERVER_ERROR_COUNT = new MetricName("/rpc/server/error_count");
+  public static final MetricName RPC_SERVER_REQUEST_BYTES =
+      new MetricName("/rpc/server/request_bytes");
+  public static final MetricName RPC_SERVER_RESPONSE_BYTES =
+      new MetricName("/rpc/server/response_bytes");
+  public static final MetricName RPC_SERVER_SERVER_LATENCY =
+      new MetricName("/rpc/server/server_latency");
+  public static final MetricName RPC_SERVER_UNCOMPRESSED_REQUEST_BYTES =
+      new MetricName("/rpc/server/uncompressed_request_bytes");
+  public static final MetricName RPC_SERVER_UNCOMPRESSED_RESPONSE_BYTES =
+      new MetricName("/rpc/server/uncompressed_response_bytes");
 
   //Visible for testing
   RpcConstants() {

core/javatests/com/google/census/CensusContextTest.java

@@ -31,9 +31,9 @@ public class CensusContextTest {
   private static final CensusContext DEFAULT = Census.getDefault();
 
   private static final MetricName[] CensusMetricNames = {
-    RpcConstants.RPC_CLIENT_BYTES_RECEIVED, RpcConstants.RPC_CLIENT_BYTES_SENT,
-    RpcConstants.RPC_CLIENT_LATENCY, RpcConstants.RPC_SERVER_BYTES_RECEIVED,
-    RpcConstants.RPC_SERVER_BYTES_SENT, RpcConstants.RPC_SERVER_LATENCY
+    RpcConstants.RPC_CLIENT_REQUEST_BYTES, RpcConstants.RPC_CLIENT_RESPONSE_BYTES,
+    RpcConstants.RPC_CLIENT_ROUNDTRIP_LATENCY, RpcConstants.RPC_SERVER_REQUEST_BYTES,
+    RpcConstants.RPC_SERVER_RESPONSE_BYTES, RpcConstants.RPC_SERVER_SERVER_LATENCY
   };
 
   private static final TagKey K_EMPTY = new TagKey("");

core/javatests/com/google/census/RpcConstantsTest.java

@@ -30,22 +30,23 @@ public void testConstants() {
     assertThat(RpcConstants.RPC_CLIENT_METHOD).isNotNull();
     assertThat(RpcConstants.RPC_SERVER_METHOD).isNotNull();
 
-    assertThat(RpcConstants.RPC_CLIENT_BYTES_RECEIVED).isNotNull();
-    assertThat(RpcConstants.RPC_CLIENT_BYTES_SENT).isNotNull();
-    assertThat(RpcConstants.RPC_CLIENT_LATENCY).isNotNull();
-    assertThat(RpcConstants.RPC_SERVER_BYTES_RECEIVED).isNotNull();
-    assertThat(RpcConstants.RPC_SERVER_BYTES_SENT).isNotNull();
-    assertThat(RpcConstants.RPC_SERVER_LATENCY).isNotNull();
+    assertThat(RpcConstants.RPC_CLIENT_ERROR_COUNT).isNotNull();
+    assertThat(RpcConstants.RPC_CLIENT_ROUNDTRIP_LATENCY).isNotNull();
+    assertThat(RpcConstants.RPC_CLIENT_REQUEST_BYTES).isNotNull();
+    assertThat(RpcConstants.RPC_CLIENT_RESPONSE_BYTES).isNotNull();
+    assertThat(RpcConstants.RPC_CLIENT_UNCOMPRESSED_REQUEST_BYTES).isNotNull();
+    assertThat(RpcConstants.RPC_CLIENT_UNCOMPRESSED_RESPONSE_BYTES).isNotNull();
+
+    assertThat(RpcConstants.RPC_SERVER_ERROR_COUNT).isNotNull();
+    assertThat(RpcConstants.RPC_SERVER_REQUEST_BYTES).isNotNull();
+    assertThat(RpcConstants.RPC_SERVER_RESPONSE_BYTES).isNotNull();
+    assertThat(RpcConstants.RPC_SERVER_SERVER_LATENCY).isNotNull();
+    assertThat(RpcConstants.RPC_SERVER_UNCOMPRESSED_REQUEST_BYTES).isNotNull();
+    assertThat(RpcConstants.RPC_SERVER_UNCOMPRESSED_RESPONSE_BYTES).isNotNull();
   }
 
-  @Test
+  @Test(expected = AssertionError.class)
   public void testConstructor() {
-    boolean threw = false;
-    try {
-      new RpcConstants();
-    } catch (AssertionError expected) {
-      threw = true;
-    }
-    assertThat(threw).isTrue();
+    new RpcConstants();
   }
 }