Fixes bug where Span.Builder.duration wasn't cleared (openzipkin#1659)

adriancole · web-flow · commit 7681822dffba · 2017-07-21T13:14:29.000+08:00
diff --git a/zipkin/src/main/java/zipkin/Span.java b/zipkin/src/main/java/zipkin/Span.java
@@ -205,6 +205,7 @@ public Builder clear() {
       id = null;
       parentId = null;
       timestamp = null;
+      duration = null;
       if (annotations != null) annotations.clear();
       if (binaryAnnotations != null) binaryAnnotations.clear();
       debug = null;
diff --git a/zipkin/src/test/java/zipkin/SpanTest.java b/zipkin/src/test/java/zipkin/SpanTest.java
@@ -15,6 +15,7 @@
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.ArrayList;
 import java.util.Arrays;
 import okio.Buffer;
 import okio.ByteString;
@@ -64,6 +65,18 @@ public void spanNamesLowercase() {
         .isEqualTo("get");
   }
 
+  @Test
+  public void clearBuilder_retainsEmptyCollections() {
+    Span.Builder builder = TestObjects.TRACE.get(1).toBuilder();
+
+    // clear should set everything null, but retain empty collections
+    Span.Builder expected = Span.builder();
+    expected.annotations = new ArrayList<>();
+    expected.binaryAnnotations = new ArrayList<>();
+    assertThat(builder.clear())
+      .isEqualToComparingFieldByField(expected);
+  }
+
   @Test
   public void mergeWhenBinaryAnnotationsSentSeparately() {
     Span part1 = Span.builder()
