Add uncompressed and compressed message sizes and deprecate the old message size. (#528)

* Add uncompressed and compressed message sizes and deprecate the old message size.

* Fix review comments.

1 files changed, 33 insertions, 5 deletions

diff --git a/api/src/test/java/io/opencensus/trace/NetworkEventTest.java b/api/src/test/java/io/opencensus/trace/NetworkEventTest.java
index 82162caf..8c132377 100644
--- a/api/src/test/java/io/opencensus/trace/NetworkEventTest.java
+++ b/api/src/test/java/io/opencensus/trace/NetworkEventTest.java
@@ -37,7 +37,7 @@ public class NetworkEventTest {
     assertThat(networkEvent.getType()).isEqualTo(NetworkEvent.Type.SENT);
     assertThat(networkEvent.getMessageId()).isEqualTo(1L);
     assertThat(networkEvent.getKernelTimestamp()).isNull();
-    assertThat(networkEvent.getMessageSize()).isEqualTo(0L);
+    assertThat(networkEvent.getUncompressedMessageSize()).isEqualTo(0L);
   }
 
   @Test
@@ -49,7 +49,18 @@ public class NetworkEventTest {
     assertThat(networkEvent.getKernelTimestamp()).isEqualTo(Timestamp.fromMillis(123456L));
     assertThat(networkEvent.getType()).isEqualTo(NetworkEvent.Type.SENT);
     assertThat(networkEvent.getMessageId()).isEqualTo(1L);
-    assertThat(networkEvent.getMessageSize()).isEqualTo(0L);
+    assertThat(networkEvent.getUncompressedMessageSize()).isEqualTo(0L);
+  }
+
+  @Test
+  public void buildNetworkEvent_WithUncompressedMessageSize() {
+    NetworkEvent networkEvent =
+        NetworkEvent.builder(NetworkEvent.Type.SENT, 1L).setUncompressedMessageSize(123L).build();
+    assertThat(networkEvent.getKernelTimestamp()).isNull();
+    assertThat(networkEvent.getType()).isEqualTo(NetworkEvent.Type.SENT);
+    assertThat(networkEvent.getMessageId()).isEqualTo(1L);
+    assertThat(networkEvent.getUncompressedMessageSize()).isEqualTo(123L);
+    assertThat(networkEvent.getMessageSize()).isEqualTo(123L);
   }
 
   @Test
@@ -60,6 +71,17 @@ public class NetworkEventTest {
     assertThat(networkEvent.getType()).isEqualTo(NetworkEvent.Type.SENT);
     assertThat(networkEvent.getMessageId()).isEqualTo(1L);
     assertThat(networkEvent.getMessageSize()).isEqualTo(123L);
+    assertThat(networkEvent.getUncompressedMessageSize()).isEqualTo(123L);
+  }
+
+  @Test
+  public void buildNetworkEvent_WithCompressedMessageSize() {
+    NetworkEvent networkEvent =
+        NetworkEvent.builder(NetworkEvent.Type.SENT, 1L).setCompressedMessageSize(123L).build();
+    assertThat(networkEvent.getKernelTimestamp()).isNull();
+    assertThat(networkEvent.getType()).isEqualTo(NetworkEvent.Type.SENT);
+    assertThat(networkEvent.getMessageId()).isEqualTo(1L);
+    assertThat(networkEvent.getCompressedMessageSize()).isEqualTo(123L);
   }
 
   @Test
@@ -67,12 +89,16 @@ public class NetworkEventTest {
     NetworkEvent networkEvent =
         NetworkEvent.builder(NetworkEvent.Type.RECV, 1L)
             .setKernelTimestamp(Timestamp.fromMillis(123456L))
-            .setMessageSize(123L)
+            .setUncompressedMessageSize(123L)
+            .setCompressedMessageSize(63L)
             .build();
     assertThat(networkEvent.getKernelTimestamp()).isEqualTo(Timestamp.fromMillis(123456L));
     assertThat(networkEvent.getType()).isEqualTo(NetworkEvent.Type.RECV);
     assertThat(networkEvent.getMessageId()).isEqualTo(1L);
+    assertThat(networkEvent.getUncompressedMessageSize()).isEqualTo(123L);
+    // Test that getMessageSize returns same as getUncompressedMessageSize();
     assertThat(networkEvent.getMessageSize()).isEqualTo(123L);
+    assertThat(networkEvent.getCompressedMessageSize()).isEqualTo(63L);
   }
 
   @Test
@@ -80,11 +106,13 @@ public class NetworkEventTest {
     NetworkEvent networkEvent =
         NetworkEvent.builder(NetworkEvent.Type.SENT, 1L)
             .setKernelTimestamp(Timestamp.fromMillis(123456L))
-            .setMessageSize(123L)
+            .setUncompressedMessageSize(123L)
+            .setCompressedMessageSize(63L)
             .build();
     assertThat(networkEvent.toString()).contains(Timestamp.fromMillis(123456L).toString());
     assertThat(networkEvent.toString()).contains("type=SENT");
     assertThat(networkEvent.toString()).contains("messageId=1");
-    assertThat(networkEvent.toString()).contains("messageSize=123");
+    assertThat(networkEvent.toString()).contains("compressedMessageSize=63");
+    assertThat(networkEvent.toString()).contains("uncompressedMessageSize=123");
   }
 }