Move SpanFactory into internal package. No need to be in the public API. (#352)

5 files changed, 12 insertions, 5 deletions

diff --git a/api/src/main/java/io/opencensus/trace/SpanBuilder.java b/api/src/main/java/io/opencensus/trace/SpanBuilder.java
index ec9719fc..b3ad8a5f 100644
--- a/api/src/main/java/io/opencensus/trace/SpanBuilder.java
+++ b/api/src/main/java/io/opencensus/trace/SpanBuilder.java
@@ -15,6 +15,7 @@ package io.opencensus.trace;
 
 import io.opencensus.common.NonThrowingCloseable;
 import io.opencensus.trace.base.EndSpanOptions;
+import io.opencensus.trace.internal.SpanFactory;
 import java.util.List;
 import javax.annotation.Nullable;
 
diff --git a/api/src/main/java/io/opencensus/trace/Tracer.java b/api/src/main/java/io/opencensus/trace/Tracer.java
index 56c4280d..64f0ae49 100644
--- a/api/src/main/java/io/opencensus/trace/Tracer.java
+++ b/api/src/main/java/io/opencensus/trace/Tracer.java
@@ -16,6 +16,7 @@ package io.opencensus.trace;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import io.opencensus.common.NonThrowingCloseable;
+import io.opencensus.trace.internal.SpanFactory;
 import javax.annotation.Nullable;
 
 /**
@@ -210,12 +211,12 @@ public abstract class Tracer {
     // No-op implementation of the SpanFactory
     private static final class NoopSpanFactory extends SpanFactory {
       @Override
-      protected Span startSpan(@Nullable Span parent, String name, StartSpanOptions options) {
+      public Span startSpan(@Nullable Span parent, String name, StartSpanOptions options) {
         return BlankSpan.INSTANCE;
       }
 
       @Override
-      protected Span startSpanWithRemoteParent(
+      public Span startSpanWithRemoteParent(
           @Nullable SpanContext remoteParent, String name, StartSpanOptions options) {
         return BlankSpan.INSTANCE;
       }
diff --git a/api/src/main/java/io/opencensus/trace/SpanFactory.java b/api/src/main/java/io/opencensus/trace/internal/SpanFactory.java
index aca5bd85..b93ec865 100644
--- a/api/src/main/java/io/opencensus/trace/SpanFactory.java
+++ b/api/src/main/java/io/opencensus/trace/internal/SpanFactory.java
@@ -11,8 +11,11 @@
  * limitations under the License.
  */
 
-package io.opencensus.trace;
+package io.opencensus.trace.internal;
 
+import io.opencensus.trace.Span;
+import io.opencensus.trace.SpanContext;
+import io.opencensus.trace.StartSpanOptions;
 import javax.annotation.Nullable;
 
 /** Factory class to create and start a {@link Span}. */
@@ -26,7 +29,7 @@ public abstract class SpanFactory {
    * @param options The options for the start of the {@code Span}.
    * @return A child {@code Span} that will have the name provided.
    */
-  protected abstract Span startSpan(@Nullable Span parent, String name, StartSpanOptions options);
+  public abstract Span startSpan(@Nullable Span parent, String name, StartSpanOptions options);
 
   /**
    * Creates and starts a new child {@link Span} (or root if parent is {@code null}), with parent
@@ -39,6 +42,6 @@ public abstract class SpanFactory {
    * @param options The options for the start of the {@code Span}.
    * @return A child {@code Span} that will have the name provided.
    */
-  protected abstract Span startSpanWithRemoteParent(
+  public abstract Span startSpanWithRemoteParent(
       @Nullable SpanContext remoteParent, String name, StartSpanOptions options);
 }
diff --git a/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java b/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
index e1123768..469fe9bb 100644
--- a/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
+++ b/api/src/test/java/io/opencensus/trace/SpanBuilderTest.java
@@ -25,6 +25,7 @@ import io.opencensus.trace.base.EndSpanOptions;
 import io.opencensus.trace.base.SpanId;
 import io.opencensus.trace.base.TraceId;
 import io.opencensus.trace.base.TraceOptions;
+import io.opencensus.trace.internal.SpanFactory;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
diff --git a/api/src/test/java/io/opencensus/trace/TracerTest.java b/api/src/test/java/io/opencensus/trace/TracerTest.java
index ad98483b..51b86b63 100644
--- a/api/src/test/java/io/opencensus/trace/TracerTest.java
+++ b/api/src/test/java/io/opencensus/trace/TracerTest.java
@@ -26,6 +26,7 @@ import io.opencensus.trace.base.EndSpanOptions;
 import io.opencensus.trace.base.SpanId;
 import io.opencensus.trace.base.TraceId;
 import io.opencensus.trace.base.TraceOptions;
+import io.opencensus.trace.internal.SpanFactory;
 import java.util.Random;
 import org.junit.Before;
 import org.junit.Rule;