Change tracer API names to create a SpanBuilder. (#407)

4 files changed, 36 insertions, 14 deletions

diff --git a/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsNonSampledSpanBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsNonSampledSpanBenchmark.java
index 06a1412f..ebc30072 100644
--- a/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsNonSampledSpanBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsNonSampledSpanBenchmark.java
@@ -36,9 +36,15 @@ public class RecordTraceEventsNonSampledSpanBenchmark {
   private static final String ATTRIBUTE_KEY = "MyAttributeKey";
   private static final String ATTRIBUTE_VALUE = "MyAttributeValue";
   private Span linkedSpan =
-      tracer.spanBuilder(null, SPAN_NAME).setSampler(Samplers.neverSample()).startSpan();
+      tracer
+          .spanBuilderWithExplicitParent(SPAN_NAME, null)
+          .setSampler(Samplers.neverSample())
+          .startSpan();
   private Span span =
-      tracer.spanBuilder(null, SPAN_NAME).setSampler(Samplers.neverSample()).startSpan();
+      tracer
+          .spanBuilderWithExplicitParent(SPAN_NAME, null)
+          .setSampler(Samplers.neverSample())
+          .startSpan();
 
   /** TearDown method. */
   @TearDown
diff --git a/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsSampledSpanBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsSampledSpanBenchmark.java
index 5773923f..6a80a26d 100644
--- a/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsSampledSpanBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/RecordTraceEventsSampledSpanBenchmark.java
@@ -36,9 +36,15 @@ public class RecordTraceEventsSampledSpanBenchmark {
   private static final String ATTRIBUTE_KEY = "MyAttributeKey";
   private static final String ATTRIBUTE_VALUE = "MyAttributeValue";
   private Span linkedSpan =
-      tracer.spanBuilder(null, SPAN_NAME).setSampler(Samplers.alwaysSample()).startSpan();
+      tracer
+          .spanBuilderWithExplicitParent(SPAN_NAME, null)
+          .setSampler(Samplers.alwaysSample())
+          .startSpan();
   private Span span =
-      tracer.spanBuilder(null, SPAN_NAME).setSampler(Samplers.alwaysSample()).startSpan();
+      tracer
+          .spanBuilderWithExplicitParent(SPAN_NAME, null)
+          .setSampler(Samplers.alwaysSample())
+          .startSpan();
 
   /** TearDown method. */
   @TearDown
diff --git a/benchmarks/src/jmh/java/io/opencensus/trace/StartEndSpanBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/StartEndSpanBenchmark.java
index 8418184f..6827c097 100644
--- a/benchmarks/src/jmh/java/io/opencensus/trace/StartEndSpanBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/StartEndSpanBenchmark.java
@@ -29,7 +29,10 @@ public class StartEndSpanBenchmark {
   private static final Tracer tracer = Tracing.getTracer();
   private static final String SPAN_NAME = "MySpanName";
   private Span rootSpan =
-      tracer.spanBuilder(null, SPAN_NAME).setSampler(Samplers.neverSample()).startSpan();
+      tracer
+          .spanBuilderWithExplicitParent(SPAN_NAME, null)
+          .setSampler(Samplers.neverSample())
+          .startSpan();
 
   @TearDown
   public void doTearDown() {
@@ -45,7 +48,10 @@ public class StartEndSpanBenchmark {
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public Span startEndNonSampledRootSpan() {
     Span span =
-        tracer.spanBuilder(null, SPAN_NAME).setSampler(Samplers.neverSample()).startSpan();
+        tracer
+            .spanBuilderWithExplicitParent(SPAN_NAME, null)
+            .setSampler(Samplers.neverSample())
+            .startSpan();
     span.end();
     return span;
   }
@@ -60,7 +66,7 @@ public class StartEndSpanBenchmark {
   public Span startEndRecordEventsRootSpan() {
     Span span =
         tracer
-            .spanBuilder(null, SPAN_NAME)
+            .spanBuilderWithExplicitParent(SPAN_NAME, null)
             .setSampler(Samplers.neverSample())
             .setRecordEvents(true)
             .startSpan();
@@ -89,7 +95,10 @@ public class StartEndSpanBenchmark {
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public Span startEndNonSampledChildSpan() {
     Span span =
-        tracer.spanBuilder(rootSpan, SPAN_NAME).setSampler(Samplers.neverSample()).startSpan();
+        tracer
+            .spanBuilderWithExplicitParent(SPAN_NAME, rootSpan)
+            .setSampler(Samplers.neverSample())
+            .startSpan();
     span.end();
     return span;
   }
@@ -104,7 +113,7 @@ public class StartEndSpanBenchmark {
   public Span startEndRecordEventsChildSpan() {
     Span span =
         tracer
-            .spanBuilder(rootSpan, SPAN_NAME)
+            .spanBuilderWithExplicitParent(SPAN_NAME, rootSpan)
             .setSampler(Samplers.neverSample())
             .setRecordEvents(true)
             .startSpan();
@@ -120,7 +129,10 @@ public class StartEndSpanBenchmark {
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public Span startEndSampledChildSpan() {
     Span span =
-        tracer.spanBuilder(rootSpan, SPAN_NAME).setSampler(Samplers.alwaysSample()).startSpan();
+        tracer
+            .spanBuilderWithExplicitParent(SPAN_NAME, rootSpan)
+            .setSampler(Samplers.alwaysSample())
+            .startSpan();
     span.end();
     return span;
   }
diff --git a/benchmarks/src/jmh/java/io/opencensus/trace/propagation/BinaryPropagationImplBenchmark.java b/benchmarks/src/jmh/java/io/opencensus/trace/propagation/BinaryPropagationImplBenchmark.java
index 4a49b9c8..d99f0dbd 100644
--- a/benchmarks/src/jmh/java/io/opencensus/trace/propagation/BinaryPropagationImplBenchmark.java
+++ b/benchmarks/src/jmh/java/io/opencensus/trace/propagation/BinaryPropagationImplBenchmark.java
@@ -38,8 +38,7 @@ public class BinaryPropagationImplBenchmark {
   private static final TraceOptions traceOptions = TraceOptions.fromBytes(traceOptionsBytes);
   private static final SpanContext spanContext = SpanContext.create(traceId, spanId, traceOptions);
   private static final BinaryFormat BINARY_PROPAGATION = new BinaryFormatImpl();
-  private static final byte[] spanContextBinary =
-      BINARY_PROPAGATION.toBinaryValue(spanContext);
+  private static final byte[] spanContextBinary = BINARY_PROPAGATION.toBinaryValue(spanContext);
 
   /**
    * This benchmark attempts to measure performance of {@link
@@ -72,7 +71,6 @@ public class BinaryPropagationImplBenchmark {
   @BenchmarkMode(Mode.SampleTime)
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public SpanContext toFromBinarySpanContext() throws ParseException {
-    return BINARY_PROPAGATION.fromBinaryValue(
-        BINARY_PROPAGATION.toBinaryValue(spanContext));
+    return BINARY_PROPAGATION.fromBinaryValue(BINARY_PROPAGATION.toBinaryValue(spanContext));
   }
 }