Split SpanImpl into record/notrecord span impl to avoid checks of recording all time. (#1468)

* Split SpanImpl into record/notrecord span impl to avoid checks of recording all time.

* Remove one extra SuppressWarnings.

9 files changed, 263 insertions, 201 deletions

diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/NoRecordEventsSpanImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/NoRecordEventsSpanImplTest.java
new file mode 100644
index 00000000..c576860d
--- /dev/null
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/NoRecordEventsSpanImplTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2018, OpenCensus Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.opencensus.implcore.trace;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import io.opencensus.trace.Annotation;
+import io.opencensus.trace.AttributeValue;
+import io.opencensus.trace.EndSpanOptions;
+import io.opencensus.trace.Link;
+import io.opencensus.trace.MessageEvent;
+import io.opencensus.trace.NetworkEvent;
+import io.opencensus.trace.Span.Options;
+import io.opencensus.trace.SpanContext;
+import io.opencensus.trace.SpanId;
+import io.opencensus.trace.Status;
+import io.opencensus.trace.TraceId;
+import io.opencensus.trace.TraceOptions;
+import io.opencensus.trace.Tracestate;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Unit tests for {@link NoRecordEventsSpanImpl}. */
+@RunWith(JUnit4.class)
+public class NoRecordEventsSpanImplTest {
+  private final Random random = new Random(1234);
+  private final SpanContext spanContext =
+      SpanContext.create(
+          TraceId.generateRandomId(random),
+          SpanId.generateRandomId(random),
+          TraceOptions.DEFAULT,
+          Tracestate.builder().build());
+  private final NoRecordEventsSpanImpl noRecordEventsSpan =
+      NoRecordEventsSpanImpl.create(spanContext);
+
+  @Test
+  public void propagatesSpanContext() {
+    assertThat(noRecordEventsSpan.getContext()).isEqualTo(spanContext);
+  }
+
+  @Test
+  public void hasNoRecordEventsOption() {
+    assertThat(noRecordEventsSpan.getOptions()).doesNotContain(Options.RECORD_EVENTS);
+  }
+
+  @Test
+  public void doNotCrash() {
+    Map<String, AttributeValue> attributes = new HashMap<String, AttributeValue>();
+    attributes.put(
+        "MyStringAttributeKey", AttributeValue.stringAttributeValue("MyStringAttributeValue"));
+    Map<String, AttributeValue> multipleAttributes = new HashMap<String, AttributeValue>();
+    multipleAttributes.put(
+        "MyStringAttributeKey", AttributeValue.stringAttributeValue("MyStringAttributeValue"));
+    multipleAttributes.put("MyBooleanAttributeKey", AttributeValue.booleanAttributeValue(true));
+    multipleAttributes.put("MyLongAttributeKey", AttributeValue.longAttributeValue(123));
+    // Tests only that all the methods are not crashing/throwing errors.
+    noRecordEventsSpan.putAttribute(
+        "MyStringAttributeKey2", AttributeValue.stringAttributeValue("MyStringAttributeValue2"));
+    noRecordEventsSpan.addAttributes(attributes);
+    noRecordEventsSpan.addAttributes(multipleAttributes);
+    noRecordEventsSpan.addAnnotation("MyAnnotation");
+    noRecordEventsSpan.addAnnotation("MyAnnotation", attributes);
+    noRecordEventsSpan.addAnnotation("MyAnnotation", multipleAttributes);
+    noRecordEventsSpan.addAnnotation(Annotation.fromDescription("MyAnnotation"));
+    noRecordEventsSpan.addNetworkEvent(NetworkEvent.builder(NetworkEvent.Type.SENT, 1L).build());
+    noRecordEventsSpan.addMessageEvent(MessageEvent.builder(MessageEvent.Type.SENT, 1L).build());
+    noRecordEventsSpan.addLink(
+        Link.fromSpanContext(SpanContext.INVALID, Link.Type.CHILD_LINKED_SPAN));
+    noRecordEventsSpan.setStatus(Status.OK);
+    noRecordEventsSpan.end(EndSpanOptions.DEFAULT);
+    noRecordEventsSpan.end();
+  }
+}
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/SpanImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/RecordEventsSpanImplTest.java
index 57818eea..b293a225 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/SpanImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/RecordEventsSpanImplTest.java
@@ -21,7 +21,7 @@ import static com.google.common.truth.Truth.assertThat;
 import io.opencensus.common.Duration;
 import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.internal.TimestampConverter;
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.testing.common.TestClock;
 import io.opencensus.trace.Annotation;
 import io.opencensus.trace.AttributeValue;
@@ -29,7 +29,6 @@ import io.opencensus.trace.EndSpanOptions;
 import io.opencensus.trace.Link;
 import io.opencensus.trace.NetworkEvent;
 import io.opencensus.trace.Span.Kind;
-import io.opencensus.trace.Span.Options;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.Status;
@@ -37,7 +36,6 @@ import io.opencensus.trace.TraceId;
 import io.opencensus.trace.TraceOptions;
 import io.opencensus.trace.config.TraceParams;
 import io.opencensus.trace.export.SpanData;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
@@ -51,9 +49,9 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
-/** Unit tests for {@link SpanImpl}. */
+/** Unit tests for {@link RecordEventsSpanImpl}. */
 @RunWith(JUnit4.class)
-public class SpanImplTest {
+public class RecordEventsSpanImplTest {
   private static final String SPAN_NAME = "MySpanName";
   private static final String ANNOTATION_DESCRIPTION = "MyAnnotation";
   private final Random random = new Random(1234);
@@ -64,8 +62,6 @@ public class SpanImplTest {
   private final Timestamp timestamp = Timestamp.create(1234, 5678);
   private final TestClock testClock = TestClock.create(timestamp);
   private final TimestampConverter timestampConverter = TimestampConverter.now(testClock);
-  private final EnumSet<Options> noRecordSpanOptions = EnumSet.noneOf(Options.class);
-  private final EnumSet<Options> recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS);
   private final Map<String, AttributeValue> attributes = new HashMap<String, AttributeValue>();
   private final Map<String, AttributeValue> expectedAttributes =
       new HashMap<String, AttributeValue>();
@@ -86,37 +82,10 @@ public class SpanImplTest {
   }
 
   @Test
-  public void toSpanData_NoRecordEvents() {
-    SpanImpl span =
-        SpanImpl.startSpan(
-            spanContext,
-            noRecordSpanOptions,
-            SPAN_NAME,
-            null,
-            parentSpanId,
-            false,
-            TraceParams.DEFAULT,
-            startEndHandler,
-            timestampConverter,
-            testClock);
-    // Check that adding trace events after Span#end() does not throw any exception.
-    span.putAttributes(attributes);
-    span.addAnnotation(Annotation.fromDescription(ANNOTATION_DESCRIPTION));
-    span.addAnnotation(ANNOTATION_DESCRIPTION, attributes);
-    span.addNetworkEvent(
-        NetworkEvent.builder(NetworkEvent.Type.RECV, 1).setUncompressedMessageSize(3).build());
-    span.addLink(Link.fromSpanContext(spanContext, Link.Type.CHILD_LINKED_SPAN));
-    span.end();
-    exception.expect(IllegalStateException.class);
-    span.toSpanData();
-  }
-
-  @Test
   public void noEventsRecordedAfterEnd() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -149,10 +118,9 @@ public class SpanImplTest {
 
   @Test
   public void deprecatedAddAttributesStillWorks() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -169,10 +137,9 @@ public class SpanImplTest {
 
   @Test
   public void toSpanData_ActiveSpan() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -229,10 +196,9 @@ public class SpanImplTest {
 
   @Test
   public void toSpanData_EndedSpan() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -291,10 +257,9 @@ public class SpanImplTest {
 
   @Test
   public void status_ViaSetStatus() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -314,10 +279,9 @@ public class SpanImplTest {
 
   @Test
   public void status_ViaEndSpanOptions() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -340,10 +304,9 @@ public class SpanImplTest {
     final int maxNumberOfAttributes = 8;
     TraceParams traceParams =
         TraceParams.DEFAULT.toBuilder().setMaxNumberOfAttributes(maxNumberOfAttributes).build();
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -389,10 +352,9 @@ public class SpanImplTest {
     final int maxNumberOfAttributes = 8;
     TraceParams traceParams =
         TraceParams.DEFAULT.toBuilder().setMaxNumberOfAttributes(maxNumberOfAttributes).build();
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -448,10 +410,9 @@ public class SpanImplTest {
     final int maxNumberOfAnnotations = 8;
     TraceParams traceParams =
         TraceParams.DEFAULT.toBuilder().setMaxNumberOfAnnotations(maxNumberOfAnnotations).build();
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -492,10 +453,9 @@ public class SpanImplTest {
             .toBuilder()
             .setMaxNumberOfNetworkEvents(maxNumberOfNetworkEvents)
             .build();
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -536,10 +496,9 @@ public class SpanImplTest {
     final int maxNumberOfLinks = 8;
     TraceParams traceParams =
         TraceParams.DEFAULT.toBuilder().setMaxNumberOfLinks(maxNumberOfLinks).build();
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -569,10 +528,9 @@ public class SpanImplTest {
 
   @Test
   public void sampleToLocalSpanStore() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -585,9 +543,8 @@ public class SpanImplTest {
     Mockito.verify(startEndHandler, Mockito.times(1)).onEnd(span);
     assertThat(span.getSampleToLocalSpanStore()).isTrue();
     span =
-        SpanImpl.startSpan(
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -603,10 +560,9 @@ public class SpanImplTest {
 
   @Test
   public void sampleToLocalSpanStore_RunningSpan() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             parentSpanId,
@@ -622,10 +578,9 @@ public class SpanImplTest {
 
   @Test
   public void getSpanKind() {
-    SpanImpl span =
-        SpanImpl.startSpan(
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             Kind.SERVER,
             parentSpanId,
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java
index 1804130c..3267eac5 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/SpanBuilderImplTest.java
@@ -19,7 +19,7 @@ package io.opencensus.implcore.trace;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.implcore.trace.internal.RandomHandler;
 import io.opencensus.testing.common.TestClock;
 import io.opencensus.trace.Span;
@@ -63,27 +63,55 @@ public class SpanBuilderImplTest {
   }
 
   @Test
+  public void startSpan_CreatesTheCorrectSpanImplInstance() {
+    assertThat(
+            SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
+                .setSampler(Samplers.alwaysSample())
+                .startSpan())
+        .isInstanceOf(RecordEventsSpanImpl.class);
+    assertThat(
+            SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
+                .setRecordEvents(true)
+                .setSampler(Samplers.neverSample())
+                .startSpan())
+        .isInstanceOf(RecordEventsSpanImpl.class);
+    assertThat(
+            SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
+                .setSampler(Samplers.neverSample())
+                .startSpan())
+        .isInstanceOf(NoRecordEventsSpanImpl.class);
+  }
+
+  @Test
   public void setSpanKind_NotNull() {
-    SpanImpl span =
-        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
-            .setSpanKind(Kind.CLIENT)
-            .startSpan();
+    RecordEventsSpanImpl span =
+        (RecordEventsSpanImpl)
+            SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
+                .setSpanKind(Kind.CLIENT)
+                .setRecordEvents(true)
+                .startSpan();
     assertThat(span.getKind()).isEqualTo(Kind.CLIENT);
     assertThat(span.toSpanData().getKind()).isEqualTo(Kind.CLIENT);
   }
 
   @Test
   public void setSpanKind_DefaultNull() {
-    SpanImpl span =
-        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions).startSpan();
+    RecordEventsSpanImpl span =
+        (RecordEventsSpanImpl)
+            SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
+                .setRecordEvents(true)
+                .startSpan();
     assertThat(span.getKind()).isNull();
     assertThat(span.toSpanData().getKind()).isNull();
   }
 
   @Test
   public void startSpanNullParent() {
-    SpanImpl span =
-        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions).startSpan();
+    RecordEventsSpanImpl span =
+        (RecordEventsSpanImpl)
+            SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
+                .setRecordEvents(true)
+                .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
@@ -96,11 +124,12 @@ public class SpanBuilderImplTest {
 
   @Test
   public void startSpanNullParentWithRecordEvents() {
-    SpanImpl span =
-        SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
-            .setSampler(Samplers.neverSample())
-            .setRecordEvents(true)
-            .startSpan();
+    RecordEventsSpanImpl span =
+        (RecordEventsSpanImpl)
+            SpanBuilderImpl.createWithParent(SPAN_NAME, null, spanBuilderOptions)
+                .setSampler(Samplers.neverSample())
+                .setRecordEvents(true)
+                .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(span.getContext().getTraceOptions().isSampled()).isFalse();
@@ -127,22 +156,25 @@ public class SpanBuilderImplTest {
     assertThat(rootSpan.getContext().isValid()).isTrue();
     assertThat(rootSpan.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(rootSpan.getContext().getTraceOptions().isSampled()).isTrue();
-    assertThat(((SpanImpl) rootSpan).toSpanData().getHasRemoteParent()).isNull();
+    assertThat(((RecordEventsSpanImpl) rootSpan).toSpanData().getHasRemoteParent()).isNull();
     Span childSpan =
         SpanBuilderImpl.createWithParent(SPAN_NAME, rootSpan, spanBuilderOptions).startSpan();
     assertThat(childSpan.getContext().isValid()).isTrue();
     assertThat(childSpan.getContext().getTraceId()).isEqualTo(rootSpan.getContext().getTraceId());
-    assertThat(((SpanImpl) childSpan).toSpanData().getParentSpanId())
+    assertThat(((RecordEventsSpanImpl) childSpan).toSpanData().getParentSpanId())
         .isEqualTo(rootSpan.getContext().getSpanId());
-    assertThat(((SpanImpl) childSpan).toSpanData().getHasRemoteParent()).isFalse();
-    assertThat(((SpanImpl) childSpan).getTimestampConverter())
-        .isEqualTo(((SpanImpl) rootSpan).getTimestampConverter());
+    assertThat(((RecordEventsSpanImpl) childSpan).toSpanData().getHasRemoteParent()).isFalse();
+    assertThat(((RecordEventsSpanImpl) childSpan).getTimestampConverter())
+        .isEqualTo(((RecordEventsSpanImpl) rootSpan).getTimestampConverter());
   }
 
   @Test
   public void startRemoteSpan_NullParent() {
-    SpanImpl span =
-        SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, null, spanBuilderOptions).startSpan();
+    RecordEventsSpanImpl span =
+        (RecordEventsSpanImpl)
+            SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, null, spanBuilderOptions)
+                .setRecordEvents(true)
+                .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
@@ -153,9 +185,11 @@ public class SpanBuilderImplTest {
 
   @Test
   public void startRemoteSpanInvalidParent() {
-    SpanImpl span =
-        SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, SpanContext.INVALID, spanBuilderOptions)
-            .startSpan();
+    RecordEventsSpanImpl span =
+        (RecordEventsSpanImpl)
+            SpanBuilderImpl.createWithRemoteParent(
+                    SPAN_NAME, SpanContext.INVALID, spanBuilderOptions)
+                .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getOptions().contains(Options.RECORD_EVENTS)).isTrue();
     assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
@@ -171,9 +205,11 @@ public class SpanBuilderImplTest {
             TraceId.generateRandomId(randomHandler.current()),
             SpanId.generateRandomId(randomHandler.current()),
             TraceOptions.DEFAULT);
-    SpanImpl span =
-        SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, spanContext, spanBuilderOptions)
-            .startSpan();
+    RecordEventsSpanImpl span =
+        (RecordEventsSpanImpl)
+            SpanBuilderImpl.createWithRemoteParent(SPAN_NAME, spanContext, spanBuilderOptions)
+                .setRecordEvents(true)
+                .startSpan();
     assertThat(span.getContext().isValid()).isTrue();
     assertThat(span.getContext().getTraceId()).isEqualTo(spanContext.getTraceId());
     assertThat(span.getContext().getTraceOptions().isSampled()).isTrue();
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/TracerImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/TracerImplTest.java
index 21143e3c..d10be6a2 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/TracerImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/TracerImplTest.java
@@ -18,7 +18,7 @@ package io.opencensus.implcore.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.implcore.trace.internal.RandomHandler.SecureRandomHandler;
 import io.opencensus.testing.common.TestClock;
 import io.opencensus.trace.BlankSpan;
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java
index 85db0868..68ce1c18 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessRunningSpanStoreImplTest.java
@@ -21,17 +21,15 @@ import static com.google.common.truth.Truth.assertThat;
 import io.opencensus.common.Duration;
 import io.opencensus.implcore.common.MillisClock;
 import io.opencensus.implcore.internal.SimpleEventQueue;
-import io.opencensus.implcore.trace.SpanImpl;
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.implcore.trace.StartEndHandlerImpl;
-import io.opencensus.trace.Span.Options;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.TraceId;
 import io.opencensus.trace.TraceOptions;
 import io.opencensus.trace.config.TraceParams;
 import io.opencensus.trace.export.RunningSpanStore.Filter;
-import java.util.EnumSet;
 import java.util.Random;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,17 +49,15 @@ public class InProcessRunningSpanStoreImplTest {
   private final StartEndHandler startEndHandler =
       new StartEndHandlerImpl(
           sampledSpansServiceExporter, activeSpansExporter, null, new SimpleEventQueue());
-  private final EnumSet<Options> recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS);
 
-  private SpanImpl createSpan(String spanName) {
+  private RecordEventsSpanImpl createSpan(String spanName) {
     final SpanContext spanContext =
         SpanContext.create(
             TraceId.generateRandomId(random),
             SpanId.generateRandomId(random),
             TraceOptions.DEFAULT);
-    return SpanImpl.startSpan(
+    return RecordEventsSpanImpl.startSpan(
         spanContext,
-        recordSpanOptions,
         spanName,
         null,
         SpanId.generateRandomId(random),
@@ -74,8 +70,8 @@ public class InProcessRunningSpanStoreImplTest {
 
   @Test
   public void getSummary_SpansWithDifferentNames() {
-    final SpanImpl span1 = createSpan(SPAN_NAME_1);
-    final SpanImpl span2 = createSpan(SPAN_NAME_2);
+    final RecordEventsSpanImpl span1 = createSpan(SPAN_NAME_1);
+    final RecordEventsSpanImpl span2 = createSpan(SPAN_NAME_2);
     assertThat(activeSpansExporter.getSummary().getPerSpanNameSummary().size()).isEqualTo(2);
     assertThat(
             activeSpansExporter
@@ -107,9 +103,9 @@ public class InProcessRunningSpanStoreImplTest {
 
   @Test
   public void getSummary_SpansWithSameName() {
-    final SpanImpl span1 = createSpan(SPAN_NAME_1);
-    final SpanImpl span2 = createSpan(SPAN_NAME_1);
-    final SpanImpl span3 = createSpan(SPAN_NAME_1);
+    final RecordEventsSpanImpl span1 = createSpan(SPAN_NAME_1);
+    final RecordEventsSpanImpl span2 = createSpan(SPAN_NAME_1);
+    final RecordEventsSpanImpl span3 = createSpan(SPAN_NAME_1);
     assertThat(activeSpansExporter.getSummary().getPerSpanNameSummary().size()).isEqualTo(1);
     assertThat(
             activeSpansExporter
@@ -142,8 +138,8 @@ public class InProcessRunningSpanStoreImplTest {
 
   @Test
   public void getActiveSpans_SpansWithDifferentNames() {
-    SpanImpl span1 = createSpan(SPAN_NAME_1);
-    SpanImpl span2 = createSpan(SPAN_NAME_2);
+    RecordEventsSpanImpl span1 = createSpan(SPAN_NAME_1);
+    RecordEventsSpanImpl span2 = createSpan(SPAN_NAME_2);
     assertThat(activeSpansExporter.getRunningSpans(Filter.create(SPAN_NAME_1, 0)))
         .containsExactly(span1.toSpanData());
     assertThat(activeSpansExporter.getRunningSpans(Filter.create(SPAN_NAME_1, 2)))
@@ -156,9 +152,9 @@ public class InProcessRunningSpanStoreImplTest {
 
   @Test
   public void getActiveSpans_SpansWithSameName() {
-    SpanImpl span1 = createSpan(SPAN_NAME_1);
-    SpanImpl span2 = createSpan(SPAN_NAME_1);
-    SpanImpl span3 = createSpan(SPAN_NAME_1);
+    RecordEventsSpanImpl span1 = createSpan(SPAN_NAME_1);
+    RecordEventsSpanImpl span2 = createSpan(SPAN_NAME_1);
+    RecordEventsSpanImpl span3 = createSpan(SPAN_NAME_1);
     assertThat(activeSpansExporter.getRunningSpans(Filter.create(SPAN_NAME_1, 0)))
         .containsExactly(span1.toSpanData(), span2.toSpanData(), span3.toSpanData());
     assertThat(activeSpansExporter.getRunningSpans(Filter.create(SPAN_NAME_1, 2)).size())
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessSampledSpanStoreImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessSampledSpanStoreImplTest.java
index e1d2c4bb..7d8b434e 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessSampledSpanStoreImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/export/InProcessSampledSpanStoreImplTest.java
@@ -21,12 +21,11 @@ import static com.google.common.truth.Truth.assertThat;
 import io.opencensus.common.Duration;
 import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.internal.SimpleEventQueue;
-import io.opencensus.implcore.trace.SpanImpl;
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.testing.common.TestClock;
 import io.opencensus.trace.EndSpanOptions;
 import io.opencensus.trace.Span;
-import io.opencensus.trace.Span.Options;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.Status;
@@ -41,7 +40,6 @@ import io.opencensus.trace.export.SampledSpanStore.PerSpanNameSummary;
 import io.opencensus.trace.export.SpanData;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -66,19 +64,18 @@ public class InProcessSampledSpanStoreImplTest {
       SpanContext.create(
           TraceId.generateRandomId(random), SpanId.generateRandomId(random), TraceOptions.DEFAULT);
   private final SpanId parentSpanId = SpanId.generateRandomId(random);
-  private final EnumSet<Options> recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS);
   private final TestClock testClock = TestClock.create(Timestamp.create(12345, 54321));
   private final InProcessSampledSpanStoreImpl sampleStore =
       new InProcessSampledSpanStoreImpl(new SimpleEventQueue());
   private final StartEndHandler startEndHandler =
       new StartEndHandler() {
         @Override
-        public void onStart(SpanImpl span) {
+        public void onStart(RecordEventsSpanImpl span) {
           // Do nothing.
         }
 
         @Override
-        public void onEnd(SpanImpl span) {
+        public void onEnd(RecordEventsSpanImpl span) {
           sampleStore.considerForSampling(span);
         }
       };
@@ -88,10 +85,9 @@ public class InProcessSampledSpanStoreImplTest {
     sampleStore.registerSpanNamesForCollection(Collections.singletonList(REGISTERED_SPAN_NAME));
   }
 
-  private SpanImpl createSampledSpan(String spanName) {
-    return SpanImpl.startSpan(
+  private RecordEventsSpanImpl createSampledSpan(String spanName) {
+    return RecordEventsSpanImpl.startSpan(
         sampledSpanContext,
-        recordSpanOptions,
         spanName,
         null,
         parentSpanId,
@@ -102,10 +98,9 @@ public class InProcessSampledSpanStoreImplTest {
         testClock);
   }
 
-  private SpanImpl createNotSampledSpan(String spanName) {
-    return SpanImpl.startSpan(
+  private RecordEventsSpanImpl createNotSampledSpan(String spanName) {
+    return RecordEventsSpanImpl.startSpan(
         notSampledSpanContext,
-        recordSpanOptions,
         spanName,
         null,
         parentSpanId,
@@ -216,7 +211,7 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getErrorSampledSpans() {
-    SpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, 1000));
     span.end(EndSpanOptions.builder().setStatus(Status.CANCELLED).build());
     Collection<SpanData> samples =
@@ -228,12 +223,12 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getErrorSampledSpans_MaxSpansToReturn() {
-    SpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, 1000));
     span1.end(EndSpanOptions.builder().setStatus(Status.CANCELLED).build());
     // Advance time to allow other spans to be sampled.
     testClock.advanceTime(Duration.create(5, 0));
-    SpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, 1000));
     span2.end(EndSpanOptions.builder().setStatus(Status.CANCELLED).build());
     Collection<SpanData> samples =
@@ -246,10 +241,10 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getErrorSampledSpans_NullCode() {
-    SpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, 1000));
     span1.end(EndSpanOptions.builder().setStatus(Status.CANCELLED).build());
-    SpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, 1000));
     span2.end(EndSpanOptions.builder().setStatus(Status.UNKNOWN).build());
     Collection<SpanData> samples =
@@ -260,10 +255,10 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getErrorSampledSpans_NullCode_MaxSpansToReturn() {
-    SpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, 1000));
     span1.end(EndSpanOptions.builder().setStatus(Status.CANCELLED).build());
-    SpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, 1000));
     span2.end(EndSpanOptions.builder().setStatus(Status.UNKNOWN).build());
     Collection<SpanData> samples =
@@ -274,7 +269,7 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getLatencySampledSpans() {
-    SpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(20)));
     span.end();
     Collection<SpanData> samples =
@@ -290,7 +285,7 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getLatencySampledSpans_ExclusiveUpperBound() {
-    SpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(20)));
     span.end();
     Collection<SpanData> samples =
@@ -305,7 +300,7 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getLatencySampledSpans_InclusiveLowerBound() {
-    SpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(20)));
     span.end();
     Collection<SpanData> samples =
@@ -321,12 +316,12 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getLatencySampledSpans_QueryBetweenMultipleBuckets() {
-    SpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(20)));
     span1.end();
     // Advance time to allow other spans to be sampled.
     testClock.advanceTime(Duration.create(5, 0));
-    SpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(200)));
     span2.end();
     Collection<SpanData> samples =
@@ -341,12 +336,12 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void getLatencySampledSpans_MaxSpansToReturn() {
-    SpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span1 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(20)));
     span1.end();
     // Advance time to allow other spans to be sampled.
     testClock.advanceTime(Duration.create(5, 0));
-    SpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span2 = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(200)));
     span2.end();
     Collection<SpanData> samples =
@@ -362,7 +357,7 @@ public class InProcessSampledSpanStoreImplTest {
 
   @Test
   public void ignoreNegativeSpanLatency() {
-    SpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
+    RecordEventsSpanImpl span = createSampledSpan(REGISTERED_SPAN_NAME);
     testClock.advanceTime(Duration.create(0, (int) TimeUnit.MICROSECONDS.toNanos(-20)));
     span.end();
     Collection<SpanData> samples =
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopRunningSpanStoreImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopRunningSpanStoreImplTest.java
index 2877bb33..96669df7 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopRunningSpanStoreImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopRunningSpanStoreImplTest.java
@@ -22,17 +22,15 @@ import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.internal.EventQueue;
 import io.opencensus.implcore.internal.SimpleEventQueue;
 import io.opencensus.implcore.internal.TimestampConverter;
-import io.opencensus.implcore.trace.SpanImpl;
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.testing.common.TestClock;
-import io.opencensus.trace.Span.Options;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.TraceId;
 import io.opencensus.trace.TraceOptions;
 import io.opencensus.trace.config.TraceParams;
 import io.opencensus.trace.export.RunningSpanStore.Filter;
-import java.util.EnumSet;
 import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,9 +52,8 @@ public class NoopRunningSpanStoreImplTest {
           TraceId.generateRandomId(random), SpanId.generateRandomId(random), TraceOptions.DEFAULT);
   private final TestClock testClock = TestClock.create(timestamp);
   private final TimestampConverter timestampConverter = TimestampConverter.now(testClock);
-  private final EnumSet<Options> recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS);
   @Mock private StartEndHandler startEndHandler;
-  private SpanImpl spanImpl;
+  private RecordEventsSpanImpl recordEventsSpanImpl;
   // maxSpansToReturn=0 means all
   private final Filter filter = Filter.create(SPAN_NAME, 0 /* maxSpansToReturn */);
   private final EventQueue eventQueue = new SimpleEventQueue();
@@ -66,10 +63,9 @@ public class NoopRunningSpanStoreImplTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
-    spanImpl =
-        SpanImpl.startSpan(
+    recordEventsSpanImpl =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             null,
@@ -90,10 +86,10 @@ public class NoopRunningSpanStoreImplTest {
   public void noopImplementation() {
     getMethodsShouldReturnEmpty();
     // onStart() does not affect the result.
-    runningSpanStoreImpl.onStart(spanImpl);
+    runningSpanStoreImpl.onStart(recordEventsSpanImpl);
     getMethodsShouldReturnEmpty();
     // onEnd() does not affect the result.
-    runningSpanStoreImpl.onEnd(spanImpl);
+    runningSpanStoreImpl.onEnd(recordEventsSpanImpl);
     getMethodsShouldReturnEmpty();
   }
 }
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopSampledSpanStoreImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopSampledSpanStoreImplTest.java
index 3ba33fd1..b9fbd432 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopSampledSpanStoreImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/export/NoopSampledSpanStoreImplTest.java
@@ -22,10 +22,9 @@ import io.opencensus.common.Timestamp;
 import io.opencensus.implcore.internal.EventQueue;
 import io.opencensus.implcore.internal.SimpleEventQueue;
 import io.opencensus.implcore.internal.TimestampConverter;
-import io.opencensus.implcore.trace.SpanImpl;
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.testing.common.TestClock;
-import io.opencensus.trace.Span.Options;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.TraceId;
@@ -35,7 +34,6 @@ import io.opencensus.trace.export.SampledSpanStore.ErrorFilter;
 import io.opencensus.trace.export.SampledSpanStore.LatencyFilter;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.Random;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,9 +57,8 @@ public final class NoopSampledSpanStoreImplTest {
           TraceId.generateRandomId(random), SpanId.generateRandomId(random), TraceOptions.DEFAULT);
   private final TestClock testClock = TestClock.create(timestamp);
   private final TimestampConverter timestampConverter = TimestampConverter.now(testClock);
-  private final EnumSet<Options> recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS);
   @Mock private StartEndHandler startEndHandler;
-  private SpanImpl spanImpl;
+  private RecordEventsSpanImpl recordEventsSpanImpl;
   // maxSpansToReturn=0 means all
   private final ErrorFilter errorFilter =
       ErrorFilter.create(SPAN_NAME, null /* canonicalCode */, 0 /* maxSpansToReturn */);
@@ -99,10 +96,9 @@ public final class NoopSampledSpanStoreImplTest {
 
     // considerForSampling() should do nothing and do not affect the result.
     // It should be called after registerSpanNamesForCollection.
-    spanImpl =
-        SpanImpl.startSpan(
+    recordEventsSpanImpl =
+        RecordEventsSpanImpl.startSpan(
             spanContext,
-            recordSpanOptions,
             SPAN_NAME,
             null,
             null,
@@ -111,8 +107,8 @@ public final class NoopSampledSpanStoreImplTest {
             startEndHandler,
             timestampConverter,
             testClock);
-    spanImpl.end();
-    sampledSpanStoreImpl.considerForSampling(spanImpl);
+    recordEventsSpanImpl.end();
+    sampledSpanStoreImpl.considerForSampling(recordEventsSpanImpl);
     getMethodsShouldReturnEmpty();
 
     // unregisterSpanNamesForCollection() should do nothing and do not affect the result.
diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java
index d99776d1..f8f1d917 100644
--- a/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java
+++ b/impl_core/src/test/java/io/opencensus/implcore/trace/export/SpanExporterImplTest.java
@@ -23,11 +23,10 @@ import static org.mockito.Mockito.doThrow;
 import io.opencensus.common.Duration;
 import io.opencensus.implcore.common.MillisClock;
 import io.opencensus.implcore.internal.SimpleEventQueue;
-import io.opencensus.implcore.trace.SpanImpl;
-import io.opencensus.implcore.trace.SpanImpl.StartEndHandler;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl;
+import io.opencensus.implcore.trace.RecordEventsSpanImpl.StartEndHandler;
 import io.opencensus.implcore.trace.StartEndHandlerImpl;
 import io.opencensus.testing.export.TestHandler;
-import io.opencensus.trace.Span.Options;
 import io.opencensus.trace.SpanContext;
 import io.opencensus.trace.SpanId;
 import io.opencensus.trace.TraceId;
@@ -35,7 +34,6 @@ import io.opencensus.trace.TraceOptions;
 import io.opencensus.trace.config.TraceParams;
 import io.opencensus.trace.export.SpanData;
 import io.opencensus.trace.export.SpanExporter.Handler;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 import org.junit.Before;
@@ -60,7 +58,6 @@ public class SpanExporterImplTest {
       SpanContext.create(
           TraceId.generateRandomId(random), SpanId.generateRandomId(random), TraceOptions.DEFAULT);
   private final RunningSpanStoreImpl runningSpanStore = new InProcessRunningSpanStoreImpl();
-  private final EnumSet<Options> recordSpanOptions = EnumSet.of(Options.RECORD_EVENTS);
   private final TestHandler serviceHandler = new TestHandler();
   @Mock private Handler mockServiceHandler;
 
@@ -69,11 +66,11 @@ public class SpanExporterImplTest {
     MockitoAnnotations.initMocks(this);
   }
 
-  private SpanImpl createSampledEndedSpan(StartEndHandler startEndHandler, String spanName) {
-    SpanImpl span =
-        SpanImpl.startSpan(
+  private RecordEventsSpanImpl createSampledEndedSpan(
+      StartEndHandler startEndHandler, String spanName) {
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             sampledSpanContext,
-            recordSpanOptions,
             spanName,
             null,
             null,
@@ -86,11 +83,11 @@ public class SpanExporterImplTest {
     return span;
   }
 
-  private SpanImpl createNotSampledEndedSpan(StartEndHandler startEndHandler, String spanName) {
-    SpanImpl span =
-        SpanImpl.startSpan(
+  private RecordEventsSpanImpl createNotSampledEndedSpan(
+      StartEndHandler startEndHandler, String spanName) {
+    RecordEventsSpanImpl span =
+        RecordEventsSpanImpl.startSpan(
             notSampledSpanContext,
-            recordSpanOptions,
             spanName,
             null,
             null,
@@ -111,8 +108,8 @@ public class SpanExporterImplTest {
 
     spanExporter.registerHandler("test.service", serviceHandler);
 
-    SpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
+    RecordEventsSpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
     List<SpanData> exported = serviceHandler.waitForExport(2);
     assertThat(exported).containsExactly(span1.toSpanData(), span2.toSpanData());
   }
@@ -125,12 +122,12 @@ public class SpanExporterImplTest {
 
     spanExporter.registerHandler("test.service", serviceHandler);
 
-    SpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span3 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span4 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span5 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span6 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span3 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span4 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span5 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span6 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
     List<SpanData> exported = serviceHandler.waitForExport(6);
     assertThat(exported)
         .containsExactly(
@@ -167,11 +164,11 @@ public class SpanExporterImplTest {
     spanExporter.registerHandler("test.service", serviceHandler);
 
     spanExporter.registerHandler("mock.service", mockServiceHandler);
-    SpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
     List<SpanData> exported = serviceHandler.waitForExport(1);
     assertThat(exported).containsExactly(span1.toSpanData());
     // Continue to export after the exception was received.
-    SpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
     exported = serviceHandler.waitForExport(1);
     assertThat(exported).containsExactly(span2.toSpanData());
   }
@@ -186,8 +183,8 @@ public class SpanExporterImplTest {
 
     TestHandler serviceHandler2 = new TestHandler();
     spanExporter.registerHandler("test.service2", serviceHandler2);
-    SpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
+    RecordEventsSpanImpl span1 = createSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
     List<SpanData> exported1 = serviceHandler.waitForExport(2);
     List<SpanData> exported2 = serviceHandler2.waitForExport(2);
     assertThat(exported1).containsExactly(span1.toSpanData(), span2.toSpanData());
@@ -202,8 +199,8 @@ public class SpanExporterImplTest {
 
     spanExporter.registerHandler("test.service", serviceHandler);
 
-    SpanImpl span1 = createNotSampledEndedSpan(startEndHandler, SPAN_NAME_1);
-    SpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
+    RecordEventsSpanImpl span1 = createNotSampledEndedSpan(startEndHandler, SPAN_NAME_1);
+    RecordEventsSpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
     // Spans are recorded and exported in the same order as they are ended, we test that a non
     // sampled span is not exported by creating and ending a sampled span after a non sampled span
     // and checking that the first exported span is the sampled span (the non sampled did not get
@@ -224,7 +221,7 @@ public class SpanExporterImplTest {
 
     spanExporter.registerHandler("test.service", serviceHandler);
 
-    SpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
+    RecordEventsSpanImpl span2 = createSampledEndedSpan(startEndHandler, SPAN_NAME_2);
 
     // Force a flush, without this, the #waitForExport() call below would block indefinitely.
     spanExporter.flush();