Add Span.Kind to the trace API. (#1223)

* Add Span.Kind to the trace API.

* Add @Nullable annotation where needed.

* Add changes to changelog.

2 files changed, 24 insertions, 0 deletions

diff --git a/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java b/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
index 1403db15..a929ad97 100644
--- a/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
+++ b/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
@@ -21,6 +21,9 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import io.opencensus.common.Scope;
+import io.opencensus.trace.Span.Kind;
+import io.opencensus.trace.samplers.Samplers;
+import java.util.Collections;
 import java.util.concurrent.Callable;
 import org.junit.Before;
 import org.junit.Test;
@@ -88,4 +91,14 @@ public class SpanBuilderTest {
     verify(span).end(EndSpanOptions.DEFAULT);
     assertThat(tracer.getCurrentSpan()).isSameAs(BlankSpan.INSTANCE);
   }
+
+  @Test
+  public void doNotCrash_NoopImplementation() throws Exception {
+    SpanBuilder spanBuilder = tracer.spanBuilder("MySpanName");
+    spanBuilder.setParentLinks(Collections.<Span>emptyList());
+    spanBuilder.setRecordEvents(true);
+    spanBuilder.setSampler(Samplers.alwaysSample());
+    spanBuilder.setSpanKind(Kind.SERVER);
+    assertThat(spanBuilder.startSpan()).isSameAs(BlankSpan.INSTANCE);
+  }
 }
diff --git a/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java b/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
index 399b35e0..b991d145 100644
--- a/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
+++ b/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
@@ -26,6 +26,7 @@ import io.opencensus.trace.Link;
 import io.opencensus.trace.Link.Type;
 import io.opencensus.trace.MessageEvent;
 import io.opencensus.trace.NetworkEvent;
+import io.opencensus.trace.Span.Kind;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.Status;
@@ -113,6 +114,7 @@ public class SpanDataTest {
             parentSpanId,
             true,
             SPAN_NAME,
+            Kind.SERVER,
             startTimestamp,
             attributes,
             annotations,
@@ -125,6 +127,7 @@ public class SpanDataTest {
     assertThat(spanData.getParentSpanId()).isEqualTo(parentSpanId);
     assertThat(spanData.getHasRemoteParent()).isTrue();
     assertThat(spanData.getName()).isEqualTo(SPAN_NAME);
+    assertThat(spanData.getKind()).isEqualTo(Kind.SERVER);
     assertThat(spanData.getStartTimestamp()).isEqualTo(startTimestamp);
     assertThat(spanData.getAttributes()).isEqualTo(attributes);
     assertThat(spanData.getAnnotations()).isEqualTo(annotations);
@@ -144,6 +147,7 @@ public class SpanDataTest {
             parentSpanId,
             true,
             SPAN_NAME,
+            null,
             startTimestamp,
             attributes,
             annotations,
@@ -175,6 +179,7 @@ public class SpanDataTest {
             null,
             null,
             SPAN_NAME,
+            null,
             startTimestamp,
             attributes,
             annotations,
@@ -206,6 +211,7 @@ public class SpanDataTest {
             parentSpanId,
             false,
             SPAN_NAME,
+            null,
             startTimestamp,
             Attributes.create(Collections.<String, AttributeValue>emptyMap(), 0),
             TimedEvents.create(Collections.<SpanData.TimedEvent<Annotation>>emptyList(), 0),
@@ -237,6 +243,7 @@ public class SpanDataTest {
             parentSpanId,
             false,
             SPAN_NAME,
+            Kind.CLIENT,
             startTimestamp,
             attributes,
             annotations,
@@ -251,6 +258,7 @@ public class SpanDataTest {
             parentSpanId,
             false,
             SPAN_NAME,
+            Kind.CLIENT,
             startTimestamp,
             attributes,
             annotations,
@@ -265,6 +273,7 @@ public class SpanDataTest {
             parentSpanId,
             false,
             SPAN_NAME,
+            null,
             startTimestamp,
             Attributes.create(Collections.<String, AttributeValue>emptyMap(), 0),
             TimedEvents.create(Collections.<SpanData.TimedEvent<Annotation>>emptyList(), 0),
@@ -287,6 +296,7 @@ public class SpanDataTest {
                 parentSpanId,
                 false,
                 SPAN_NAME,
+                Kind.CLIENT,
                 startTimestamp,
                 attributes,
                 annotations,
@@ -299,6 +309,7 @@ public class SpanDataTest {
     assertThat(spanDataString).contains(spanContext.toString());
     assertThat(spanDataString).contains(parentSpanId.toString());
     assertThat(spanDataString).contains(SPAN_NAME);
+    assertThat(spanDataString).contains(Kind.CLIENT.toString());
     assertThat(spanDataString).contains(startTimestamp.toString());
     assertThat(spanDataString).contains(attributes.toString());
     assertThat(spanDataString).contains(annotations.toString());