Change SpanData to use span name instead of display name. (#423)

4 files changed, 21 insertions, 21 deletions

diff --git a/api/src/main/java/io/opencensus/trace/export/SpanData.java b/api/src/main/java/io/opencensus/trace/export/SpanData.java
index 762335af..3bcf9e72 100644
--- a/api/src/main/java/io/opencensus/trace/export/SpanData.java
+++ b/api/src/main/java/io/opencensus/trace/export/SpanData.java
@@ -45,7 +45,7 @@ public abstract class SpanData {
    * @param parentSpanId the parent {@code SpanId} of the {@code Span}. {@code null} if the {@code
    *     Span} is a root.
    * @param hasRemoteParent {@code true} if the parent is on a different process.
-   * @param displayName the name of the {@code Span}.
+   * @param name the name of the {@code Span}.
    * @param startTimestamp the start {@code Timestamp} of the {@code Span}.
    * @param attributes the attributes associated with the {@code Span}.
    * @param annotations the annotations associated with the {@code Span}.
@@ -61,7 +61,7 @@ public abstract class SpanData {
       SpanContext context,
       @Nullable SpanId parentSpanId,
       boolean hasRemoteParent,
-      String displayName,
+      String name,
       Timestamp startTimestamp,
       Attributes attributes,
       TimedEvents<Annotation> annotations,
@@ -73,7 +73,7 @@ public abstract class SpanData {
         context,
         parentSpanId,
         hasRemoteParent,
-        displayName,
+        name,
         startTimestamp,
         attributes,
         annotations,
@@ -106,11 +106,11 @@ public abstract class SpanData {
   public abstract boolean getHasRemoteParent();
 
   /**
-   * Returns the display name of this {@code Span}.
+   * Returns the name of this {@code Span}.
    *
-   * @return the display name of this {@code Span}.
+   * @return the name of this {@code Span}.
    */
-  public abstract String getDisplayName();
+  public abstract String getName();
 
   /**
    * Returns the start {@code Timestamp} of this {@code Span}.
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 aeb99abf..9af46446 100644
--- a/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
+++ b/api/src/test/java/io/opencensus/trace/export/SpanDataTest.java
@@ -50,7 +50,7 @@ public class SpanDataTest {
   private static final Timestamp eventTimestamp2 = Timestamp.create(123, 458);
   private static final Timestamp eventTimestamp3 = Timestamp.create(123, 459);
   private static final Timestamp endTimestamp = Timestamp.create(123, 460);
-  private static final String DISPLAY_NAME = "MySpanDisplayName";
+  private static final String SPAN_NAME = "MySpanName";
   private static final String ANNOTATION_TEXT = "MyAnnotationText";
   private static final Annotation annotation = Annotation.fromDescription(ANNOTATION_TEXT);
   private static final NetworkEvent recvNetworkEvent =
@@ -96,7 +96,7 @@ public class SpanDataTest {
             spanContext,
             parentSpanId,
             true,
-            DISPLAY_NAME,
+            SPAN_NAME,
             startTimestamp,
             attributes,
             annotations,
@@ -107,7 +107,7 @@ public class SpanDataTest {
     assertThat(spanData.getContext()).isEqualTo(spanContext);
     assertThat(spanData.getParentSpanId()).isEqualTo(parentSpanId);
     assertThat(spanData.getHasRemoteParent()).isTrue();
-    assertThat(spanData.getDisplayName()).isEqualTo(DISPLAY_NAME);
+    assertThat(spanData.getName()).isEqualTo(SPAN_NAME);
     assertThat(spanData.getStartTimestamp()).isEqualTo(startTimestamp);
     assertThat(spanData.getAttributes()).isEqualTo(attributes);
     assertThat(spanData.getAnnotations()).isEqualTo(annotations);
@@ -124,7 +124,7 @@ public class SpanDataTest {
             spanContext,
             null,
             false,
-            DISPLAY_NAME,
+            SPAN_NAME,
             startTimestamp,
             attributes,
             annotations,
@@ -135,7 +135,7 @@ public class SpanDataTest {
     assertThat(spanData.getContext()).isEqualTo(spanContext);
     assertThat(spanData.getParentSpanId()).isNull();
     assertThat(spanData.getHasRemoteParent()).isFalse();
-    assertThat(spanData.getDisplayName()).isEqualTo(DISPLAY_NAME);
+    assertThat(spanData.getName()).isEqualTo(SPAN_NAME);
     assertThat(spanData.getStartTimestamp()).isEqualTo(startTimestamp);
     assertThat(spanData.getAttributes()).isEqualTo(attributes);
     assertThat(spanData.getAnnotations()).isEqualTo(annotations);
@@ -152,7 +152,7 @@ public class SpanDataTest {
             spanContext,
             parentSpanId,
             false,
-            DISPLAY_NAME,
+            SPAN_NAME,
             startTimestamp,
             Attributes.create(Collections.<String, AttributeValue>emptyMap(), 0),
             TimedEvents.create(Collections.<SpanData.TimedEvent<Annotation>>emptyList(), 0),
@@ -163,7 +163,7 @@ public class SpanDataTest {
     assertThat(spanData.getContext()).isEqualTo(spanContext);
     assertThat(spanData.getParentSpanId()).isEqualTo(parentSpanId);
     assertThat(spanData.getHasRemoteParent()).isFalse();
-    assertThat(spanData.getDisplayName()).isEqualTo(DISPLAY_NAME);
+    assertThat(spanData.getName()).isEqualTo(SPAN_NAME);
     assertThat(spanData.getStartTimestamp()).isEqualTo(startTimestamp);
     assertThat(spanData.getAttributes().getAttributeMap().isEmpty()).isTrue();
     assertThat(spanData.getAnnotations().getEvents().isEmpty()).isTrue();
@@ -180,7 +180,7 @@ public class SpanDataTest {
             spanContext,
             parentSpanId,
             false,
-            DISPLAY_NAME,
+            SPAN_NAME,
             startTimestamp,
             attributes,
             annotations,
@@ -193,7 +193,7 @@ public class SpanDataTest {
             spanContext,
             parentSpanId,
             false,
-            DISPLAY_NAME,
+            SPAN_NAME,
             startTimestamp,
             attributes,
             annotations,
@@ -206,7 +206,7 @@ public class SpanDataTest {
             spanContext,
             parentSpanId,
             false,
-            DISPLAY_NAME,
+            SPAN_NAME,
             startTimestamp,
             Attributes.create(Collections.<String, AttributeValue>emptyMap(), 0),
             TimedEvents.create(Collections.<SpanData.TimedEvent<Annotation>>emptyList(), 0),
@@ -227,7 +227,7 @@ public class SpanDataTest {
                 spanContext,
                 parentSpanId,
                 false,
-                DISPLAY_NAME,
+            SPAN_NAME,
                 startTimestamp,
                 attributes,
                 annotations,
@@ -238,7 +238,7 @@ public class SpanDataTest {
             .toString();
     assertThat(spanDataString).contains(spanContext.toString());
     assertThat(spanDataString).contains(parentSpanId.toString());
-    assertThat(spanDataString).contains(DISPLAY_NAME);
+    assertThat(spanDataString).contains(SPAN_NAME);
     assertThat(spanDataString).contains(startTimestamp.toString());
     assertThat(spanDataString).contains(attributes.toString());
     assertThat(spanDataString).contains(annotations.toString());
diff --git a/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java b/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java
index 5088e0e5..76d3dd75 100644
--- a/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/trace/SpanBuilderImplTest.java
@@ -63,7 +63,7 @@ public class SpanBuilderImplTest {
     assertThat(spanData.getParentSpanId()).isNull();
     assertThat(spanData.getHasRemoteParent()).isFalse();
     assertThat(spanData.getStartTimestamp()).isEqualTo(testClock.now());
-    assertThat(spanData.getDisplayName()).isEqualTo(SPAN_NAME);
+    assertThat(spanData.getName()).isEqualTo(SPAN_NAME);
   }
 
   @Test
diff --git a/impl_core/src/test/java/io/opencensus/trace/SpanImplTest.java b/impl_core/src/test/java/io/opencensus/trace/SpanImplTest.java
index 6b74e5d1..8651b35a 100644
--- a/impl_core/src/test/java/io/opencensus/trace/SpanImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/trace/SpanImplTest.java
@@ -148,7 +148,7 @@ public class SpanImplTest {
     span.addLink(link);
     SpanData spanData = span.toSpanData();
     assertThat(spanData.getContext()).isEqualTo(spanContext);
-    assertThat(spanData.getDisplayName()).isEqualTo(SPAN_NAME);
+    assertThat(spanData.getName()).isEqualTo(SPAN_NAME);
     assertThat(spanData.getParentSpanId()).isEqualTo(parentSpanId);
     assertThat(spanData.getHasRemoteParent()).isTrue();
     assertThat(spanData.getAttributes().getDroppedAttributesCount()).isEqualTo(0);
@@ -206,7 +206,7 @@ public class SpanImplTest {
     Mockito.verify(startEndHandler, Mockito.times(1)).onEnd(span);
     SpanData spanData = span.toSpanData();
     assertThat(spanData.getContext()).isEqualTo(spanContext);
-    assertThat(spanData.getDisplayName()).isEqualTo(SPAN_NAME);
+    assertThat(spanData.getName()).isEqualTo(SPAN_NAME);
     assertThat(spanData.getParentSpanId()).isEqualTo(parentSpanId);
     assertThat(spanData.getHasRemoteParent()).isFalse();
     assertThat(spanData.getAttributes().getDroppedAttributesCount()).isEqualTo(0);